fix bug in sed on changelog, and make script handle repeated runs better

svn path=/trunk/; revision=16464

1 files changed, 12 insertions, 3 deletions

diff --git a/scripts/upload-pd-extended-to-launchpad.sh b/scripts/upload-pd-extended-to-launchpad.sh
index d7a1fd69..66c2e6a8 100755
--- a/scripts/upload-pd-extended-to-launchpad.sh
+++ b/scripts/upload-pd-extended-to-launchpad.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 IPBASE=`ifconfig  | grep 'inet addr' \
     | sed -n 's|.*inet addr:\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p' \
     | grep -v '127\.0\.0'`
@@ -19,12 +21,19 @@ BASE_URL=http://${DOWNLOAD_SERVER}/auto-build/$URL_DATE
 
 echo "Downloading source package from $BASE_URL"
 
-wget ${BASE_URL}/${ORIG}
+# get the tarballs, and use existing versions if already there
+wget -c ${BASE_URL}/${ORIG}
+wget -c ${BASE_URL}/${DEBIAN}
+# always fetch MD5s to make sure the existing tarballs were correct
+rm -f *.md5
 wget ${BASE_URL}/${ORIG}.md5
-wget ${BASE_URL}/${DEBIAN}
 wget ${BASE_URL}/${DEBIAN}.md5
 md5sum -c ${ORIG}.md5
 md5sum -c ${DEBIAN}.md5
+
+if [ -d pd-extended ]; then
+    rm -rf pd-extended
+fi
 tar xjf ${ORIG}
 # rename tarball to Debian orig name
 mv $ORIG `echo $ORIG | sed 's,^P,p,' | sed 's,-source,.orig,'`
@@ -32,7 +41,7 @@ cd pd-extended
 tar xjf ../${DEBIAN}
 
 sed -i \
-    's|^\(pd-extended (0.*-[0-9]\).*) [a-zA-Z][a-zA-Z]*|\1~lucid) lucid|p' \
+    's|^\(pd-extended (0.*-[0-9]\).*) [a-zA-Z][a-zA-Z]*;|\1~lucid) lucid;|' \
     debian/changelog
 debuild -S
 sed -i s,lucid,maverick,g debian/changelog && debuild -S