Merge branch 'master' of fozzie:projects/ctf

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

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

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

packages/p2/www/index.html

@@ -20,6 +20,12 @@
       </li>
     </ul>
 
+    <p>
+      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.
+    </p>
+
     <p>
       Project 2 is a puzzle-based game for individuals or teams.
       Get started by creating a new team at the console, then start