From 1ee6beda0b0b9ede82dd08837b1b3f2a2cc7160c Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Mon, 16 Jul 2012 17:46:27 -0600 Subject: [PATCH 1/2] a few changes for HACK --- packages/00common/service/pointsd/mkpage | 4 +++- packages/00common/service/pointsd/pointsd | 2 +- packages/00common/service/pointsd/run | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/00common/service/pointsd/mkpage b/packages/00common/service/pointsd/mkpage index b23331e..ea084ac 100755 --- a/packages/00common/service/pointsd/mkpage +++ b/packages/00common/service/pointsd/mkpage @@ -1,7 +1,9 @@ #! /bin/sh +OPT=${CTF_BASE:-/opt} + # Use first installed binary -for bin in /opt/*/bin/$1; do +for bin in $OPT/*/bin/$1; do if [ -x $bin ]; then exec $bin fi diff --git a/packages/00common/service/pointsd/pointsd b/packages/00common/service/pointsd/pointsd index 7673c76..fd68f46 100755 --- a/packages/00common/service/pointsd/pointsd +++ b/packages/00common/service/pointsd/pointsd @@ -26,7 +26,7 @@ for pwfile in $OPT/*/password; do if [ -f $pwfile ]; then ( cat bkup.png - tar cvf - $BASE | gzip -c | $OPT/*/bin/tea 3< $pwfile + tar cf - $BASE | gzip -c | $OPT/*/bin/tea 3< $pwfile ) > $BACKUP.new mv $BACKUP.new $BACKUP break diff --git a/packages/00common/service/pointsd/run b/packages/00common/service/pointsd/run index 6294c72..033d17c 100755 --- a/packages/00common/service/pointsd/run +++ b/packages/00common/service/pointsd/run @@ -40,10 +40,9 @@ if [ -x /sbin/inotifyd ]; then fi # Simulate inotifyd by polling -cd $NEWDIR while true; do - find . -type f | while read fn; do - ./pointsd m $NEWDIR ${fn#./} + find $NEWDIR -type f | while read fn; do + ./pointsd m $NEWDIR ${fn##*/} done sleep 7 done From 783a07d2346330e2be3feb68dabf5bc9ff99b36f Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Fri, 20 Jul 2012 15:35:20 -0600 Subject: [PATCH 2/2] add network disclaimer to p2 page --- packages/p2/www/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/p2/www/index.html b/packages/p2/www/index.html index 70a9de4..5bc4a7b 100644 --- a/packages/p2/www/index.html +++ b/packages/p2/www/index.html @@ -20,6 +20,12 @@ +

+ We can't make any guarantees about the behavior of others on this network. + We advise you to disconnect as soon as you've retrieved the puzzles + you want to work on. +

+

Project 2 is a puzzle-based game for individuals or teams. Get started by creating a new team at the console, then start