From 8ed0bf2e27a67f3d46413eca8e468a727ddfd4f1 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Sun, 19 Jul 2026 21:59:27 -0400 Subject: [PATCH 1/2] add switch_conference, lose .sh, add gitignore for reports --- .gitignore | 1 + .../{make_conference.sh => make_conference} | 0 .../{make_conference.sh => make_conference} | 0 ...conference_full.sh => make_conference_full | 4 +-- switch_conference | 28 +++++++++++++++++++ .../{make_conference.sh => make_conference} | 0 6 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 .gitignore rename bluetooth/classic_discoverable/{make_conference.sh => make_conference} (100%) rename bluetooth/iBeacon/{make_conference.sh => make_conference} (100%) rename make_conference_full.sh => make_conference_full (96%) create mode 100755 switch_conference rename wifi/wifi_ap_client/{make_conference.sh => make_conference} (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2211df6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.txt diff --git a/bluetooth/classic_discoverable/make_conference.sh b/bluetooth/classic_discoverable/make_conference similarity index 100% rename from bluetooth/classic_discoverable/make_conference.sh rename to bluetooth/classic_discoverable/make_conference diff --git a/bluetooth/iBeacon/make_conference.sh b/bluetooth/iBeacon/make_conference similarity index 100% rename from bluetooth/iBeacon/make_conference.sh rename to bluetooth/iBeacon/make_conference diff --git a/make_conference_full.sh b/make_conference_full similarity index 96% rename from make_conference_full.sh rename to make_conference_full index 8969422..4eae2ec 100755 --- a/make_conference_full.sh +++ b/make_conference_full @@ -38,8 +38,8 @@ fi for challenge in bluetooth/iBeacon bluetooth/classic_discoverable wifi/wifi_ap_client non-kitsune-foxes/fm_fox; do pushd "${challenge}" > /dev/null 2>&1 printf "Rolling %s for %s... " "${challenge}" "${conf}" - if [ -x make_conference.sh ]; then - ./make_conference.sh "${requested_conf}" + if [ -x make_conference ]; then + ./make_conference "${requested_conf}" if [ ! -e "src/conferences/${conf}.h" ]; then printf "Something went wrong creating %s/src/conferences/%s.h, please scroll up\n" "${challenge}" "${conf}" exit 1 diff --git a/switch_conference b/switch_conference new file mode 100755 index 0000000..04191fb --- /dev/null +++ b/switch_conference @@ -0,0 +1,28 @@ +#!/bin/bash +set -e +set -u + +# Ensure we have a conference name +if [ -n "${1:-}" ]; then + conf="${1}" +else + printf "Please provide conference name\n" + exit 1 +fi + +# Check if that conference name already exists +for challenge in bluetooth/iBeacon bluetooth/classic_discoverable wifi/wifi_ap_client; do + pushd "${challenge}" > /dev/null 2>&1 + if [ ! -e "src/conferences/${conf}.h" ]; then + printf "%s/src/conferences/%s.h does not exist, unable to switch to this conference\n" "${challenge}" "${conf}" + exit 1 + fi + popd > /dev/null 2>&1 +done + +for challenge in bluetooth/iBeacon bluetooth/classic_discoverable wifi/wifi_ap_client; do + pushd "${challenge}" > /dev/null 2>&1 + ln -snf "conferences/${conf}.h" src/current_conf.h + popd > /dev/null 2>&1 +done +printf "Switched to %s\n" "${conf}" diff --git a/wifi/wifi_ap_client/make_conference.sh b/wifi/wifi_ap_client/make_conference similarity index 100% rename from wifi/wifi_ap_client/make_conference.sh rename to wifi/wifi_ap_client/make_conference From d5b4d7b0e795490d6a26b53837cdf3029bcf1d93 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 20 Jul 2026 06:45:49 -0400 Subject: [PATCH 2/2] fix references to make_conference.sh --- non-kitsune-foxes/README.md | 2 +- qa/build-test-skel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/non-kitsune-foxes/README.md b/non-kitsune-foxes/README.md index fcafcfe..cb50d77 100644 --- a/non-kitsune-foxes/README.md +++ b/non-kitsune-foxes/README.md @@ -1 +1 @@ -This folder is full of pretend stubs so that make_conference.sh will create flags and directions for foxes we use for the RF CTF which are not actually part of kitsune. +This folder is full of pretend stubs so that `make_conference` will create flags and directions for foxes we use for the RF CTF which are not actually part of kitsune. diff --git a/qa/build-test-skel b/qa/build-test-skel index e855bc9..6e64492 100755 --- a/qa/build-test-skel +++ b/qa/build-test-skel @@ -6,7 +6,7 @@ python3 -m pip install -U platformio sudo apt-get install cracklib-runtime -y ## Create a new conference from 9999skel -./make_conference_full.sh github-ci +./make_conference_full github-ci ## Verify is worked if [ ! -r "$(date +"%Y")github-ci.txt" ]; then printf "Report file missing\n"