From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Wed, 24 Nov 2004 21:34:56 +0000 (+0000)
Subject: Removing build directory after creating distribution
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2acbb0a6e7fc9d33ab4d3fd0cb8bf7cffb56298b;p=nagiosplug.git

Removing build directory after creating distribution


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@936 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/tools/sfsnapshot b/tools/sfsnapshot
index a383760..c9c56bd 100755
--- a/tools/sfsnapshot
+++ b/tools/sfsnapshot
@@ -26,7 +26,7 @@ function make_dist {
 	# 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 @@ function make_dist {
 
 	cd $PROJECT
 
-	# TODO: Maybe this should only be run when necessary?
 	tools/setup
 
 	./configure
@@ -46,6 +45,7 @@ function make_dist {
 	# May fail if file not generated - do not trap
 	mv *.gz $IN
 
+	rm -rf $COMPILE_DIR
 	# End ssh
 EOF
 }
@@ -64,7 +64,7 @@ OUT_SERVER="shell.sf.net"
 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 @@ done
 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