[pkg-haskell-tools] 01/01: upgrade: Allow a path to be specified

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit f876f72ef9b1d2f27eba342d92c6409de739f7b7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 15 11:19:37 2015 +0200

    upgrade: Allow a path to be specified
---
 scripts/upgrade | 89 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 1432620..ae14286 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,7 +15,7 @@ fi
 if [ "$1" = "--manpage" ]
 then
 cat <<__END__
-Usage: dht upgrade [-D dist]
+Usage: dht upgrade [-D dist] directory/
 
 This script will:
 
@@ -31,13 +31,6 @@ __END__
 	exit 0;
 fi
 
-if [ ! -d debian ]
-then
-  echo "No debian/ directory found!"
-  echo "Run me in the packaging directory."
-  exit 1
-fi
-
 if [ "$1" = "-D" ]
 then
 	dist="$2"
@@ -47,56 +40,68 @@ else
 	dist=unstable
 fi
 
+for dir in "$@"
+do
+  pushd $dir >/dev/null
+
+  if [ ! -d debian ]
+  then
+    echo "ERROR: No debian/ directory found in $dir; run me in the packaging directory."
+    continue
+    popd $dir >/dev/null
+  fi
 
-cabal_name="$(cat debian/watch | grep http | cut -d/ -f5)"
-package="$(grep-dctrl -n -s Source . < debian/control)"
-old_version=`dpkg-parsechangelog -ldebian/changelog -c1 | grep-dctrl -n -s Version .`
-old_version=`echo $old_version | cut -d- -f1` # this could be improved
-if echo $old_version | fgrep -q : ; then
+
+  cabal_name="$(cat debian/watch | grep http | cut -d/ -f5)"
+  package="$(grep-dctrl -n -s Source . < debian/control)"
+  old_version=`dpkg-parsechangelog -ldebian/changelog -c1 | grep-dctrl -n -s Version .`
+  old_version=`echo $old_version | cut -d- -f1` # this could be improved
+  if echo $old_version | fgrep -q : ; then
 	old_version=`echo $old_version | cut -d: -f2-`
 	epoch=`echo $old_version | cut -d: -f1`:
-else
-        epoch=''
-fi
+  else
+          epoch=''
+  fi
 
-version=$(grep "^$cabal_name " ../../../package-plan/packages.txt|cut -d\  -f2)
+  version=$(grep "^$cabal_name " ../../../package-plan/packages.txt|cut -d\  -f2)
 
-if [ -z "$version" ]
-then
+  if [ -z "$version" ]
+  then
 	echo "could not detect version to upgrade to."
 	exit 1
-fi
+  fi
 
-if [ "$version" = "$old_version" ]
-then
+  if [ "$version" = "$old_version" ]
+  then
 	echo "No new version to upgrade to."
 	exit 1
-fi
+  fi
 
-debchange --changelog debian/changelog --newversion="$epoch$version-1" 'New upstream release'
-origtargz -u
+  debchange --changelog debian/changelog --newversion="$epoch$version-1" 'New upstream release'
+  origtargz -u
 
-if grep -q '^DEB_ENABLE_TESTS = yes' debian/rules
-then
-  test=""
-else
-  test="--no-tests"
-fi
+  if grep -q '^DEB_ENABLE_TESTS = yes' debian/rules
+  then
+    test=""
+  else
+    test="--no-tests"
+  fi
 
-cabal-debian --official --upgrade $test
-find debian/ -name '*~' -delete
+  cabal-debian --official --upgrade $test
+  find debian/ -name '*~' -delete
 
-dch -D $dist -r ''
+  dch -D $dist -r ''
 
-git commit . -q -m "$cabal_name: Upgrading from $old_version to $version"
+  git commit . -q -m "$cabal_name: Upgrading from $old_version to $version"
 
-echo "Upgraded $cabal_name to $version"
-echo "Please check git show HEAD for sanity."
-echo "Please check http://hdiff.luite.com/cgit/$cabal_name/diff/?id=$version&id2=$old_version for interesting changes."
-if test -d debian/patches
-then
-	echo "Please refresh the patches"
-fi
+  echo "Upgraded $cabal_name to $version"
+  echo "Please check git show HEAD for sanity."
+  echo "Please check http://hdiff.luite.com/cgit/$cabal_name/diff/?id=$version&id2=$old_version for interesting changes."
+  if test -d debian/patches
+  then
+    echo "Please refresh the patches"
+  fi
+done
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git