Fix stage and upload (again)

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7876 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-08 22:00:06 +00:00
parent e6049baeeb
commit 2e15eccbe3
3 changed files with 14 additions and 2 deletions

View File

@ -288,6 +288,18 @@ touch $LOGFILE
progress_message "Build of Shorewall $VERSION on $(date)" progress_message "Build of Shorewall $VERSION on $(date)"
case $VERSION in case $VERSION in
4.1.*-*)
PATCHNUM=${VERSION#*-}
SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}"
LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}"
PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}"
SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}"
DOCTAG="trunk/docs"
XMLPROJ="docs-4.0"
SAMPLESTAG="trunk/Samples"
MANPAGETAG=trunk/manpages
LITEMANPAGETAG=trunk/manpages-lite
;;
4.1.*) 4.1.*)
SVNBRANCH="trunk/Shorewall-common" SVNBRANCH="trunk/Shorewall-common"
LITESVNBRANCH="trunk/Shorewall-lite" LITESVNBRANCH="trunk/Shorewall-lite"

View File

@ -181,7 +181,7 @@ if [ "$HOSTNAME" = lists ]; then
COMMAND=cp COMMAND=cp
else else
ssh $USER mkdir -p $DEST ssh $USER mkdir -p $DEST
[ -n "$BASE" ] && ssh $USER mkdir -p $DEST [ -n "$BASE" ] && ssh $USER mkdir -p $DEST/base
DEST=${USER}:${DEST} DEST=${USER}:${DEST}
fi fi

View File

@ -185,7 +185,7 @@ if [ "$HOSTNAME" = lists ]; then
COMMAND=cp COMMAND=cp
else else
ssh $USER mkdir -p $DEST ssh $USER mkdir -p $DEST
[ -n "$BASE" ] && ssh $USER mkdir -p $DEST [ -n "$BASE" ] && ssh $USER mkdir -p $DEST/base
DEST=${USER}:${DEST} DEST=${USER}:${DEST}
fi fi