Allow the update and stage scripts to run on the primary server -- take 2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6859 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-14 14:56:49 +00:00
parent b716223fb5
commit 70b67c69d8
2 changed files with 6 additions and 4 deletions

View File

@ -6,7 +6,7 @@ perldir=
shelldir= shelldir=
DEST= DEST=
USER="webmin@mail.shorewall.net:" USER="webmin@mail.shorewall.net"
SHOREWALL=shorewall SHOREWALL=shorewall
COMMAND=scp COMMAND=scp
@ -44,7 +44,8 @@ case $1 in
rpm=shorewall-${1}-1.noarch.rpm rpm=shorewall-${1}-1.noarch.rpm
;; ;;
3.*Beta*|*RC*) 3.*Beta*|*RC*)
DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1" DEST="/srv/ftp/pub/shorewall/development $DEST=${USER}${DEST}
/staging/${1%.*}/shorewall-$1"
rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
;; ;;
@ -90,7 +91,7 @@ if [ "$HOSTNAME" = lists ]; then
COMMAND=cp COMMAND=cp
else else
ssh $USER mkdir -p $DEST ssh $USER mkdir -p $DEST
$DEST=${USER}${DEST} $DEST=${USER}:${DEST}
fi fi
$COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST

View File

@ -6,7 +6,7 @@ perlrpm=
shellrpm= shellrpm=
DEST= DEST=
USER="webmin@mail.shorewall.net:" USER="webmin@mail.shorewall.net"
SHOREWALL=shorewall SHOREWALL=shorewall
COMMAND=scp COMMAND=scp
@ -84,6 +84,7 @@ if [ "$HOSTNAME" = lists ]; then
COMMAND=cp COMMAND=cp
else else
ssh $USER mkdir -p $DEST ssh $USER mkdir -p $DEST
$DEST=${USER}:${DEST}
fi fi
$COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST