Fix a Deb package build error

Related commit "Fix bugs when username including backslash"
Error : dpkg-divert: error: failed to open package info file /var/lib/dpkg/status for reading

Change-Id: Ic0f0ee6ec19ac178264f3f60f447401b230a6352

diff --git a/build-pkg-deb b/build-pkg-deb
index 2ee0f956b0398f66ee9de31cd85452358cfe8d95..6f625b20bc6755d5a7346cb320a65d63888e3a7a 100644 (file)
--- a/build-pkg-deb
+++ b/build-pkg-deb
@@ -41,24 +41,24 @@ deb_chroot ()
 }
 
 deb_setup() {
-    mkdir -p $"BUILD_ROOT"/var/lib/dpkg
-    mkdir -p $"BUILD_ROOT"/var/log
-    mkdir -p $"BUILD_ROOT"/etc/default
-    :>> $"BUILD_ROOT"/var/lib/dpkg/status
-    :>> $"BUILD_ROOT"/var/lib/dpkg/available
-    :>> $"BUILD_ROOT"/var/log/dpkg.log
-    :>> $"BUILD_ROOT"/etc/ld.so.conf
-    :>> $"BUILD_ROOT"/etc/default/rcS
+    mkdir -p "$BUILD_ROOT"/var/lib/dpkg
+    mkdir -p "$BUILD_ROOT"/var/log
+    mkdir -p "$BUILD_ROOT"/etc/default
+    :>> "$BUILD_ROOT"/var/lib/dpkg/status
+    :>> "$BUILD_ROOT"/var/lib/dpkg/available
+    :>> "$BUILD_ROOT"/var/log/dpkg.log
+    :>> "$BUILD_ROOT"/etc/ld.so.conf
+    :>> "$BUILD_ROOT"/etc/default/rcS
 }
 
 pkg_initdb_deb() {
     deb_setup
     # force dpkg into database to make epoch test work
-    if ! test "'$BUILD_ROOT'/.init_b_cache/rpms/dpkg.deb" -ef "'$BUILD_ROOT'/.init_b_cache/dpkg.deb" ; then
-       rm -f $"BUILD_ROOT"/.init_b_cache/dpkg.deb
-       cp $"BUILD_ROOT"/.init_b_cache/rpms/dpkg.deb $"BUILD_ROOT"/.init_b_cache/dpkg.deb || cleanup_and_exit 1
+    if ! test "$BUILD_ROOT/.init_b_cache/rpms/dpkg.deb" -ef "$BUILD_ROOT/.init_b_cache/dpkg.deb" ; then
+       rm -f "$BUILD_ROOT"/.init_b_cache/dpkg.deb
+       cp "$BUILD_ROOT"/.init_b_cache/rpms/dpkg.deb "$BUILD_ROOT"/.init_b_cache/dpkg.deb || cleanup_and_exit 1
     fi
-    deb_chroot $"BUILD_ROOT" dpkg --install --force-depends .init_b_cache/dpkg.deb >/dev/null 2>&1
+    deb_chroot "$BUILD_ROOT" dpkg --install --force-depends .init_b_cache/dpkg.deb >/dev/null 2>&1
 }
 
 pkg_prepare_deb() {
@@ -66,7 +66,7 @@ pkg_prepare_deb() {
 }
 
 pkg_install_deb() {
-    ( deb_chroot $"BUILD_ROOT" dpkg --install --force-depends .init_b_cache/$PKG.deb 2>&1 || touch $"BUILD_ROOT"/exit ) | \
+    ( deb_chroot "$BUILD_ROOT" dpkg --install --force-depends .init_b_cache/$PKG.deb 2>&1 || touch "$BUILD_ROOT"/exit ) | \
        perl -ne '$|=1;/^(Configuration file|Installing new config file|Selecting previously deselected|Selecting previously unselected|\(Reading database|Unpacking |Setting up|Creating config file|Preparing to replace dpkg|Preparing to unpack )/||/^$/||print'
     # ugly workaround for upstart system. some packages (procps) try
     # to start a service in their configure phase. As we don't have