making more use of quotation marks, and adding pbuilder checkparams support for all apps. They all have decent command-line support now, I guess

4 files changed, 54 insertions, 19 deletions

diff --git a/pbuilder-buildpackage.sh b/pbuilder-buildpackage.sh
index 1999552..13b1bc6 100755
--- a/pbuilder-buildpackage.sh
+++ b/pbuilder-buildpackage.sh
@@ -3,42 +3,44 @@ export LANG=C
 export LC_ALL=C
 
 function copydsc () {
-    local DSCFILE=$1
-    local TARGET=$2
+    local DSCFILE="$1"
+    local TARGET="$2"
     for FILE in \
       "$DSCFILE" \
       $(echo "$DSCFILE" | sed 's/^\(.*\)\.dsc$/\1/' ).diff.gz \
       $(echo "$DSCFILE" | sed 's/^\(.*\)\.dsc$/\1/').tar.gz \
       $(echo "$DSCFILE" | sed 's/\(.*\)-[^-.]*\.dsc$/\1/').orig.tar.gz ; do
-        cp $FILE $TARGET ;
+        cp "$FILE" "$TARGET" ;
     done
 
 }
 
 function checkbuilddep () {
     for INSTALLPKG in $($CHROOTEXEC bin/sh -c "(cd tmp/buildd/*/; dpkg-checkbuilddeps)" 2>&1 |grep "^dpkg-checkbuilddeps: Unmet build dependencies: " | sed 's/^[^:]*:[^:]*: \(.*\)$/\1/' | awk 'BEGIN{RS=", "} /^([^([]*)/{print $1}'); do
-	echo   Installing $INSTALLPKG
-	$CHROOTEXEC usr/bin/apt-get -y install $INSTALLPKG
+	echo " -> Installing $INSTALLPKG"
+	$CHROOTEXEC usr/bin/apt-get -y install "$INSTALLPKG"
     done;
     for REMOVEPKG in $($CHROOTEXEC bin/sh -c "(cd tmp/buildd/*/; dpkg-checkbuilddeps)" 2>&1 |grep "^dpkg-checkbuilddeps: Build conflicts: " | sed 's/^[^:]*:[^:]*: \(.*\)$/\1/' | awk 'BEGIN{RS=", "} /^([^([]*)/{print $1}'); do
-	echo Removing $REMOVEPKG
-	$CHROOTEXEC usr/bin/apt-get -y remove $REMOVEPKG
+	echo " -> Removing $REMOVEPKG"
+	$CHROOTEXEC usr/bin/apt-get -y remove "$REMOVEPKG"
     done;
 }
 
-PACKAGENAME=$1
+
 . /etc/pbuilderrc
+. /usr/lib/pbuilder/pbuilder-checkparams
+PACKAGENAME="$1"
 CHROOTEXEC="chroot $BUILDPLACE "
 
 echo cleaning the build env
-rm -rf $BUILDPLACE
+rm -rf "$BUILDPLACE"
 
 echo building the build env
-mkdir -p $BUILDPLACE
+mkdir -p "$BUILDPLACE"
 (
- cd $BUILDPLACE
- tar xfzp $BASETGZ
- mkdir -p $BUILDPLACE/tmp/buildd
+ cd "$BUILDPLACE"
+ tar xfzp "$BASETGZ"
+ mkdir -p "$BUILDPLACE/tmp/buildd"
 )
 echo Copying source file
 copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd"
@@ -49,4 +51,3 @@ checkbuilddep
 echo Building the package
 $CHROOTEXEC /bin/sh -c "(cd tmp/buildd/*/; dpkg-buildpackage)"
 
-#  LocalWords:  dpkg
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 488775e..0ea13ff 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -1,3 +1,39 @@
 # this is sourced from pbuilder packages to process the optional parameters.
 
+while [ -n $1 ]; do
+  case "$1" in 
+    --basetgz) 
+      BASETGZ="$2";
+      shift; shift;
+      ;;
+    --buildplace)
+      BUILDPLACE="$2";
+      shift; shift;
+      ;;
+    --mirror)
+      MIRROR="$2";
+      shift; shift;
+      ;;
+    --http-proxy)
+      export http_proxy="$2";
+      shift; shift;
+      ;;
+    --distribution)
+      DISTRIBUTION="$2";
+      shift; shift;
+    --help)
+      cat <<EOF
+Command Line Options:
+ --basetgz [base.tgz location]
+ --buildplace [location of build]
+ --mirror [mirror location]
+ --http-proxy [proxy]
+ --distribution [distribution(woody/sid)]
+EOF
+    exit 1;
+      ;;
+    *)
+      break;
+  esac
+done
 
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 7494ae4..b6a01db 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -3,8 +3,8 @@
 export LANG=C
 export LC_ALL=C
 
-DISTRIBUTION=$1
 . /etc/pbuilderrc
+. /usr/lib/pbuilder/pbuilder-checkparams
 CHROOTEXEC="chroot $BUILDPLACE "
 if [ -z "$DISTRIBUTION" ]; then
   DISTRIBUTION=woody
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index ef578b3..54f9a4c 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -2,13 +2,11 @@
 export LANG=C
 export LC_ALL=C
 
-#this option is optional
-DISTRIBUTION=$1
-
 . /etc/pbuilderrc
+. /usr/lib/pbuilder/pbuilder-checkparams
 CHROOTEXEC="chroot $BUILDPLACE "
 
-echo "Upgrading for distribution $DISTRIBUTION" 
+test -n "$DISTRIBUTION" && echo "Upgrading for distribution $DISTRIBUTION" 
 
 #cd $MYREPOSITORY
 #echo Initializing repository