![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/tools/sfsnapshot b/tools/sfsnapshot
index 34c5795cec79d27b5266234ebe28ffb4ab9aa0c8..3b71219a765f757b1904ab290953ff9fd1d90183 100755 (executable)
--- a/tools/sfsnapshot
+++ b/tools/sfsnapshot
# Butchered version of snapshot
# Can only run on the shell compile farm server
# Will always create a snapshot of HEAD
-# If want multiple snapshots, just run with "sfsnapshot {branch} [branch2 ...]"
+# If want multiple snapshots, just run with "sfsnapshot [branch ...]"
# Assumes:
# ssh setup to send to shell.sf.net and $CF without password prompt
-# autconf and automake installed on shell cf at v 2.57 & 1.72 and in PATH
+# the compile server has all the prerequisites stated at http://nagiosplug.sourceforge.net/developer-guidelines.html
+# Install in cron with something like:
+# 47 * * * * $HOME/bin/mail_error -o $HOME/sfsnapshot.out -m tonvoon@users.sf.net sfsnapshot r1_3_0
function die { echo $1; exit 1; }
-# This makes the distribution. Expects $1 as CVS tag, otherwise uses HEAD
+# This makes the distribution. Expects $1 as branches/name, otherwise uses trunk
function make_dist {
if [[ -n $1 ]] ; then
- cvs_rel=$1
- v="$1-"
+ svn_url_suffix=$1
+ name=${1##*/}
else
- cvs_rel="HEAD"
- v=""
+ svn_url_suffix="trunk"
+ name="trunk"
fi
+ v="$name-"
# Get compile server to do the work
# Variables will be expanded locally before being run on $CF
- ssh $CF <<-EOF
+ ssh $CF <<EOF
set -x
- PATH=$PATH
- [[ ! -d $IN/$cvs_rel ]] && mkdir -p $IN/$cvs_rel
- cd $IN/$cvs_rel
- if [[ -d $PROJECT ]] ; then
- cd $PROJECT
- cvs update -r $cvs_rel
- else
- cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nagiosplug co -r $cvs_rel nagiosplug
- cd $PROJECT
- fi
+ PATH=$PATH:/usr/local/bin
+ [[ ! -d $COMPILE_DIR/$name ]] && mkdir -p $COMPILE_DIR/$name
+ cd $COMPILE_DIR/$name
+
+ # Cannot use cvs export due to conflicts on second run - think this is better for cvs server
+ svn export https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/$svn_url_suffix $PROJECT
+
+ cd $PROJECT
+
+ tools/setup
- sed 's/^VER=.*/VER=$v$DS/;s/^REL=.*/REL=snapshot/' configure.in > configure.tmp
- mv configure.tmp configure.in
- aclocal -I lib
- autoheader
- autoconf
- automake --add-missing --copy
- autoreconf
./configure
# Make the Nagiosplug dist tarball
- make dist
+ make dist VERSION=$v$DS RELEASE=snapshot
+ # May fail if file not generated - do not trap
+ mv *.gz $IN
+
+ rm -rf $COMPILE_DIR
# End ssh
- EOF
+EOF
}
# Set working variables
PROJECT=nagiosplug
+
+# This is local to the compile server for faster compile
+COMPILE_DIR=/tmp/tonvoon/tmp_snapshot
+
+# Needs to be on NFS so gz file can be read on the compile shell server
IN=${HOME}/tmp_snapshot
-OUT_SERVER="shell.sf.net"
+
+# Where to place the generated files
+OUT_SERVER="tonvoon@web.sourceforge.net"
OUT="/home/groups/n/na/nagiosplug/htdocs/snapshot"
-CF="usf-cf-x86-linux-2"
+
+# Make sure prereqs are satisfied on server!
+CF="localhost"
DS=`date -u +%Y%m%d%H%M`
+# Setup home directory area
+[[ ! -d $IN ]] && mkdir -p $IN
+
# Make dists for HEAD and any others in command parameters
make_dist
for i in $* ; do
make_dist $i
done
+# Create MD5 sum
+cd $IN
+cat <<-END_README > README
+This is the daily SVN snapshot of nagiosplug, consisting of the SVN trunk
+and any other branches.
+
+The nagios-plugins-HEAD.tar.gz link will always go to the latest trunk snapshot
+(name kept for existing tinderbox scripts to link correctly).
+
+The MD5SUM is:
+END_README
+md5sum *.gz | tee -a README > MD5SUM
+
+
# Check for *.gz files locally (expect NFS between cf shell server and $CF)
set -x
-files=$(ls $IN/*/$PROJECT/*.gz 2>/dev/null)
+cd $IN
+files=$(ls *.gz 2>/dev/null)
[[ -z $files ]] && die "No files created"
-ssh $OUT_SERVER "rm -f $OUT/*.gz"
-scp $files $OUT_SERVER:$OUT
-
-# Create MD5 sum
-ssh $OUT_SERVER << EOF
+head_file=$(cd $IN && ls -rt *-trunk-*.gz | head -1 2>/dev/null)
+cat <<-EOF > /tmp/batchfile.$$
cd $OUT
-md5sum *.gz > MD5SUM
+rm *.gz
+put *.gz
+ln $head_file nagios-plugins-HEAD.tar.gz
+put MD5SUM
+put README readme
EOF
-rm -f $files
+# Do the actual transfer
+# Have to put README down as readme because SF's apache server appears to block README files
+sftp -b /tmp/batchfile.$$ $OUT_SERVER
+
+rm -f $files /tmp/batchfile.$$
+# Work out success or failure
+expected=$(($# + 1))
+set -- $files
+[[ $# -ne $expected ]] && die "Expected $expected, got $#"
+exit 0