[Python-checkins] python/dist/src/Doc/tools push-docs.sh,1.16,1.17

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26350

Modified Files:
	push-docs.sh 
Log Message:
- add link to the downloadable package in the generated email
- misc. changes


Index: push-docs.sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/push-docs.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** push-docs.sh	28 Sep 2003 22:14:29 -0000	1.16
--- push-docs.sh	17 Jun 2004 18:36:54 -0000	1.17
***************
*** 7,10 ****
--- 7,12 ----
  TARGETDIR=/usr/home/fdrake/tmp
  
+ PKGTYPE="bzip"  # must be one of: bzip, tar, zip  ("tar" implies gzip)
+ 
  TARGET="$TARGETHOST:$TARGETDIR"
  
***************
*** 28,31 ****
--- 30,34 ----
  ANNOUNCE=true
  
+ # XXX Should use getopt(1) here.
  while [ "$#" -gt 0 ] ; do
    case "$1" in
***************
*** 34,37 ****
--- 37,44 ----
            shift 2
            ;;
+       -p)
+           PKGTYPE="$2"
+           shift 1
+           ;;
        -q)
            ANNOUNCE=false
***************
*** 69,77 ****
  MYDIR="`pwd`"
  
  cd ..
  
  # now in .../Doc/
! make --no-print-directory bziphtml || exit $?
! PACKAGE="html-$VERSION.tar.bz2"
  scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?
  ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?
--- 76,95 ----
  MYDIR="`pwd`"
  
+ if [ "$PKGTYPE" = bzip ] ; then
+     PKGEXT=tar.bz2
+ elif [ "$PKGTYPE" = tar ] ; then
+     PKGEXT=tgz
+ elif [ "$PKGTYPE" = zip ] ; then
+     PKGEXT=zip
+ else
+     echo 1>&2 "unsupported package type: $PKGTYPE"
+     exit 2
+ fi
+ 
  cd ..
  
  # now in .../Doc/
! make --no-print-directory ${PKGTYPE}html || exit $?
! PACKAGE="html-$VERSION.$PKGEXT"
  scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?
  ssh "$TARGETHOST" tmp/update-docs.sh $DOCTYPE $PACKAGE '&&' rm tmp/update-docs.sh || exit $?
***************
*** 89,92 ****
--- 107,114 ----
  
  $EXPLANATION
+ 
+ A downloadable package containing the HTML is also available:
+ 
+     http://$TARGETHOST/dev/doc/python-docs-$DOCTYPE.$PKGEXT
  EOF
      exit $?