X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=d9454917f6ce07ab53b9fb38e7a0f4a44c81a0ff;hb=a3437249cba058014b62d69f44685e47678b7774;hp=80e720b6152458d0d4b0b64a27e52d8041a6e3fd;hpb=9c238b1bf446d204ef91ddbba49050c2cc6e943d;p=uffi.git

diff --git a/make-upstream.sh b/make-upstream.sh
index 80e720b..d945491 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -5,24 +5,30 @@
 
 set -e # abort on error
 
-progname="`basename \"$0\"`"
-
 usage () {
-  cat >&2 <<EOF
+    progname="`basename \"$0\"`"
+
+    cat >&2 <<EOF
 Usage: $progname [options]
 Creates upstream archives
 Options:
+  -c   Commit and tag CVS tree with current version numbers
   -t   Tag CVS tree with current version numbers
+  -f   Force creation of upstream archive, even if exists'
   -h   Print this brief help
 EOF
 }
 
+opt_force=0
+
 # Command line
 while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
         -h)  usage; exit 0           ;;
+        -c)  opt_commit=1; opt_tag=1 ;;
         -t)  opt_tag=1               ;;
+	-f)  opt_force=1             ;;
          *)  usage; exit 0           ;;
     esac
     shift
@@ -45,6 +51,19 @@ if [ ! -z ${opt_tag} ]; then
     cvs -q tag -F $UPSTREAM_TAG > /dev/null
 
 fi
+
+if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
+  echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
+  echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
+  read answer
+  case $answer in
+      [Yy]*) nop= ;;
+      *) echo "Not building"
+	 exit 1
+	  ;;
+  esac
+fi
+
 # Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
@@ -53,10 +72,10 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
-rm -f upload.sh make-dist.sh cvsbp-prepare 
+rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh 
 rm -f `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS`
-rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~'`
+rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
 rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`
 cd ..