invirt-build-release: clean up some shell and perl

Also wait to parse the .dsc file until we've made it.

svn path=/trunk/packages/invirt-dev/; revision=1860

diff --git a/debian/changelog b/debian/changelog
index 8249c14..6766d7f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ invirt-dev (0.0.11) unstable; urgency=low
 
   * add i386 to apt repo
   * extend invirt-build-release to handle amd64 + i386
+  * invirt-build-release: clean up some shell and some perl
 
  -- Greg Price <price@mit.edu>  Fri, 19 Dec 2008 23:37:02 -0500
 

diff --git a/invirt-build-release b/invirt-build-release
index 05c9d18..480cf36 100755 (executable)
--- a/invirt-build-release
+++ b/invirt-build-release
@@ -12,20 +12,19 @@ for package; do
     svn export $svnuri/trunk/packages/$package build-release/$package
     cd build-release/$package
     
-    eval  `perl '-F:\s+' -lane 'print  $F[0]."=".$F[1] if /^Version|^Source|^Distribution/' \
-        <(dpkg-parsechangelog)`
-    eval $(perl '-F:\s+' -lane 'print $F[0]."=".$F[1] if /^Binary|Architecture/' <"../${Source}_${Version}.dsc")
-
+    eval $(perl -ne 'print if s/^(Version|Source|Distribution): /\1=/' \
+             <(dpkg-parsechangelog))
     dpkg-buildpackage -us -uc -rfakeroot -S
     cd ..
+    eval $(perl -ne 'print if s/^(Architecture): /\1=/' ${Source}_${Version}.dsc)
     case $Architecture in
       all)
-        sbuild -A -d hardy "${Source}_${Version}.dsc";;
+        sbuild -A -d hardy ${Source}_${Version}.dsc;;
       any)
-        sbuild -d hardy-amd64 "${Source}_${Version}.dsc"
-        sbuild -d hardy-i386  "${Source}_${Version}.dsc";;
+        sbuild -d hardy-amd64 ${Source}_${Version}.dsc
+        sbuild -d hardy-i386  ${Source}_${Version}.dsc;;
       *)
-        echo "invirt-build-release: architecture '$Architecture' not 'all' or 'any'" >&2
+        echo "invirt-build-release: arch '$Architecture' unimplemented" >&2
         exit 1
     esac
 
@@ -41,15 +40,14 @@ for package; do
     fi
     
     [ $Distribution = 'unstable' ] \
-        || echo "$(basename $0): warning: Distribution is ${Distribution}, script expects unstable"
+        || echo "$(basename $0): warning: Distribution is $Distribution, script expects unstable"
     changesfile=`pwd`/${Source}_*${Version}*.changes
     for i in $changesfile; do
         reprepro-env include unstable $i
-        reprepro-env copy stable unstable \
-           $(perl '-F:\s+' -lane 'print $F[1]." " if /^Binary/' <$i)
+        reprepro-env copy stable unstable $(sed -ne 's/^Binary: //p' $i)
     done
-    reprepro-env copy stable unstable ${Source}
+    reprepro-env copy stable unstable $Source
     
     cd ..
-    rm -rf build-release
+    rm -rf build-release/$package
 done