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

[fdrake at users.sourceforge.net]

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

Modified Files:
	push-docs.sh 
Log Message:
add another way to specify an alternate name for the documentation set,
so that this is harder to forget to do for development of new styles


Index: push-docs.sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/push-docs.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- push-docs.sh	2 Nov 2004 19:20:43 -0000	1.21
+++ push-docs.sh	13 Nov 2004 17:45:39 -0000	1.22
@@ -26,6 +26,7 @@
     DOCTYPE="devel"
 fi
 
+DOCTYPE_SPECIFIED=false
 EXPLANATION=''
 ANNOUNCE=true
 
@@ -55,6 +56,7 @@
           ;;
       -t)
           DOCTYPE="$2"
+          DOCTYPE_SPECIFIED=true
           shift 2
           ;;
       -F)
@@ -99,9 +101,17 @@
     exit 2
 fi
 
+# switch to .../Doc/
 cd ..
 
-# now in .../Doc/
+# If $DOCTYPE was not specified explicitly, look for .doctype in
+# .../Doc/ and use the content of that file if present.
+if $DOCTYPE_SPECIFIED ; then
+    :
+elif [ -f .doctype ] ; then
+    DOCTYPE="`cat .doctype`"
+fi
+
 make --no-print-directory ${PKGTYPE}html || exit $?
 PACKAGE="html-$VERSION.$PKGEXT"
 scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?