cleanbuildplace is split out and made some things surrounded by quotes

4 files changed, 18 insertions, 17 deletions

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 091c023..43620d6 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -31,8 +31,7 @@ function checkbuilddep () {
 PACKAGENAME="$1"
 CHROOTEXEC="chroot $BUILDPLACE "
 
-echo "cleaning the build env [$BUILDPLACE]"
-rm -rf "$BUILDPLACE"
+cleanbuildplace
 
 echo "building the build env"
 mkdir -p "$BUILDPLACE"
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index cb512f5..0bd1488 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -10,15 +10,14 @@ if [ -z "$DISTRIBUTION" ]; then
 fi
 echo Distribution is $DISTRIBUTION.
 
-echo cleaning the build env
-rm -rf $BUILDPLACE
+cleanbuildplace
 
 echo "building the build env"
-mkdir -p $BUILDPLACE
+mkdir -p "$BUILDPLACE"
 mountproc
 echo " -> running debootstrap"
-(cd $BUILDPLACE; debootstrap $DISTRIBUTION .)
-mkdir -p $BUILDPLACE/tmp/buildd
+( cd "$BUILDPLACE"; debootstrap "$DISTRIBUTION" . )
+mkdir -p "$BUILDPLACE/tmp/buildd"
 echo " -> copying local configuration"
 for a in passwd hosts hostname resolv.conf apt; do 
   cp -r /etc/$a $BUILDPLACE/etc/;
@@ -39,4 +38,5 @@ $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKA
 $CHROOTEXEC /usr/bin/apt-get clean
 umountproc
 echo " -> creating base.tgz"
-( cd $BUILDPLACE ; tar cfz $BASETGZ * )
+( cd "$BUILDPLACE" ; tar cfz "$BASETGZ" * )
+cleanbuildplace
diff --git a/pbuilder-modules b/pbuilder-modules
index 7601738..fb4e996 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -16,6 +16,12 @@ function mountproc () {
   fi
 }
 
+function cleanbuildplace () {
+    if [ -d "$BUILDPLACE" ]; then 
+      echo cleaning the build env
+      rm -rf "$BUILDPLACE"
+    fi;
+}
 
 #required for some packages to install...
 export LANG=C
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index f3e21ce..6da1a1b 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -7,14 +7,11 @@ CHROOTEXEC="chroot $BUILDPLACE "
 
 test -n "$DISTRIBUTION" && echo "Upgrading for distribution $DISTRIBUTION" 
 
-echo "cleaning the build env"
-rm -rf $BUILDPLACE
-
+cleanbuildplace
 echo "building the build env"
 echo " -> extracting base.tgz"
-mkdir -p $BUILDPLACE
-cd $BUILDPLACE
-tar xfzp $BASETGZ
+mkdir -p "$BUILDPLACE"
+(cd "$BUILDPLACE"; tar xfzp "$BASETGZ")
 mountproc
 mkdir -p $BUILDPLACE/tmp/buildd
 echo " -> copying local configuration"
@@ -39,6 +36,5 @@ $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKA
 $CHROOTEXEC /usr/bin/apt-get clean
 umountproc
 echo " -> creating base.tgz"
-cd $BUILDPLACE
-tar cfz $BASETGZ *
-
+(cd $BUILDPLACE; tar cfz $BASETGZ *)
+cleanbuildplace