Update the helper scripts that push development docs to SourceForge;

this version avoids having to build a separate authenticated connection
to push the update-docs.sh script to SF.

diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh
index 0703d11000c756351ec2ac146b920ef1b878e890..c227bcf4ccc623e654aad4db9fd7a2592062c4c0 100755 (executable)
--- a/Doc/tools/push-docs.sh
+++ b/Doc/tools/push-docs.sh
@@ -28,9 +28,9 @@ cd ..
 make --no-print-directory || exit $?
 make --no-print-directory bziphtml || exit $?
 RELEASE=`grep '^RELEASE=' Makefile | sed 's|RELEASE=||'`
-scp "html-$RELEASE.tar.bz2" $TARGET/python-docs-update.tar.bz2 || exit $?
-scp tools/update-docs.sh $TARGET/update-docs.sh || exit $?
-ssh python.sourceforge.net 'tmp/update-docs.sh && rm tmp/update-docs.sh' || exit $?
+PACKAGE="html-$RELEASE.tar.bz2"
+scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?
+ssh python.sourceforge.net tmp/update-docs.sh $PACKAGE '&&' rm tmp/update-docs.sh || exit $?
 
 Mail -s '[development doc updates]' $ADDRESSES <<EOF
 The development version of the documentation has been updated:

diff --git a/Doc/tools/update-docs.sh b/Doc/tools/update-docs.sh
index b3621d5149fc9df4d71a91bb42ccd2c3660af73f..79652aca4e2d56c951f9925a6a614a726201d337 100755 (executable)
--- a/Doc/tools/update-docs.sh
+++ b/Doc/tools/update-docs.sh
@@ -11,9 +11,9 @@ if [ -z "$HOME" ] ; then
     export HOME
 fi
 
-UPDATES=$HOME/tmp/python-docs-update.tar.bz2
+UPDATES="$HOME/tmp/$1"
 
-cd /home/groups/python/htdocs
+cd /home/groups/python/htdocs || exit $?
 rm -rf devel-docs || exit $?
 mkdir devel-docs || exit $?
 cd devel-docs || exit $?