Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.txt
File renamed without changes.
4 changes: 2 additions & 2 deletions make_conference_full.sh → make_conference_full
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion non-kitsune-foxes/README.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion qa/build-test-skel
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 28 additions & 0 deletions switch_conference
Original file line number Diff line number Diff line change
@@ -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}"