[Nagiosplug-checkins] nagiosplug/tools sfsnapshot,1.15,1.16

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26899

Modified Files:
	sfsnapshot 
Log Message:
Removing build directory after creating distribution


Index: sfsnapshot
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/tools/sfsnapshot,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sfsnapshot	26 Jun 2004 16:39:02 -0000	1.15
+++ sfsnapshot	24 Nov 2004 21:34:56 -0000	1.16
@@ -26,7 +26,7 @@
 	# Variables will be expanded locally before being run on $CF
 	ssh $CF <<EOF
 	set -x
-	PATH=$PATH
+	PATH=$PATH:/usr/local/bin
 	[[ ! -d $COMPILE_DIR/$cvs_rel ]] && mkdir -p $COMPILE_DIR/$cvs_rel
 	cd $COMPILE_DIR/$cvs_rel
 
@@ -35,7 +35,6 @@
 
 	cd $PROJECT
 
-	# TODO: Maybe this should only be run when necessary?
 	tools/setup
 
 	./configure
@@ -46,6 +45,7 @@
 	# May fail if file not generated - do not trap
 	mv *.gz $IN
 
+	rm -rf $COMPILE_DIR
 	# End ssh
 EOF
 }
@@ -64,7 +64,7 @@
 OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot"
 
 # Make sure prereqs are satisfied on server!
-CF="x86-solaris1"
+CF="x86-linux2"
 DS=`date -u +%Y%m%d%H%M`
 
 # Setup home directory area
@@ -80,11 +80,11 @@
 set -x
 files=$(ls $IN/*.gz 2>/dev/null)
 [[ -z $files ]] && die "No files created"
-ssh $OUT_SERVER "rm -f $OUT/*.gz"
-scp $files $OUT_SERVER:$OUT
+ssh -2 $OUT_SERVER "rm -f $OUT/*.gz"
+scp -2 $files $OUT_SERVER:$OUT
 
 # Create MD5 sum
-ssh $OUT_SERVER << EOF
+ssh -2 $OUT_SERVER << EOF
 cd $OUT
 cat <<-END_README > README
 This is the daily CVS snapshot of nagiosplug, consisting of the CVS HEAD