From 93084076fa62dad08208d9aa29e47dfb33f0cc18 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Mon, 16 Jul 2012 17:46:27 -0600 Subject: [PATCH] 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