diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/sfsnapshot | 12 |
1 files changed, 6 insertions, 6 deletions
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 { | |||
26 | # Variables will be expanded locally before being run on $CF | 26 | # Variables will be expanded locally before being run on $CF |
27 | ssh $CF <<EOF | 27 | ssh $CF <<EOF |
28 | set -x | 28 | set -x |
29 | PATH=$PATH | 29 | PATH=$PATH:/usr/local/bin |
30 | [[ ! -d $COMPILE_DIR/$cvs_rel ]] && mkdir -p $COMPILE_DIR/$cvs_rel | 30 | [[ ! -d $COMPILE_DIR/$cvs_rel ]] && mkdir -p $COMPILE_DIR/$cvs_rel |
31 | cd $COMPILE_DIR/$cvs_rel | 31 | cd $COMPILE_DIR/$cvs_rel |
32 | 32 | ||
@@ -35,7 +35,6 @@ function make_dist { | |||
35 | 35 | ||
36 | cd $PROJECT | 36 | cd $PROJECT |
37 | 37 | ||
38 | # TODO: Maybe this should only be run when necessary? | ||
39 | tools/setup | 38 | tools/setup |
40 | 39 | ||
41 | ./configure | 40 | ./configure |
@@ -46,6 +45,7 @@ function make_dist { | |||
46 | # May fail if file not generated - do not trap | 45 | # May fail if file not generated - do not trap |
47 | mv *.gz $IN | 46 | mv *.gz $IN |
48 | 47 | ||
48 | rm -rf $COMPILE_DIR | ||
49 | # End ssh | 49 | # End ssh |
50 | EOF | 50 | EOF |
51 | } | 51 | } |
@@ -64,7 +64,7 @@ OUT_SERVER="shell.sf.net" | |||
64 | OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot" | 64 | OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot" |
65 | 65 | ||
66 | # Make sure prereqs are satisfied on server! | 66 | # Make sure prereqs are satisfied on server! |
67 | CF="x86-solaris1" | 67 | CF="x86-linux2" |
68 | DS=`date -u +%Y%m%d%H%M` | 68 | DS=`date -u +%Y%m%d%H%M` |
69 | 69 | ||
70 | # Setup home directory area | 70 | # Setup home directory area |
@@ -80,11 +80,11 @@ done | |||
80 | set -x | 80 | set -x |
81 | files=$(ls $IN/*.gz 2>/dev/null) | 81 | files=$(ls $IN/*.gz 2>/dev/null) |
82 | [[ -z $files ]] && die "No files created" | 82 | [[ -z $files ]] && die "No files created" |
83 | ssh $OUT_SERVER "rm -f $OUT/*.gz" | 83 | ssh -2 $OUT_SERVER "rm -f $OUT/*.gz" |
84 | scp $files $OUT_SERVER:$OUT | 84 | scp -2 $files $OUT_SERVER:$OUT |
85 | 85 | ||
86 | # Create MD5 sum | 86 | # Create MD5 sum |
87 | ssh $OUT_SERVER << EOF | 87 | ssh -2 $OUT_SERVER << EOF |
88 | cd $OUT | 88 | cd $OUT |
89 | cat <<-END_README > README | 89 | cat <<-END_README > README |
90 | This is the daily CVS snapshot of nagiosplug, consisting of the CVS HEAD | 90 | This is the daily CVS snapshot of nagiosplug, consisting of the CVS HEAD |