update vbuilder.sh.in: use __chroot_sh

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@453 ec354946-7b23-47d6-9f5a-488ba84defc7

vbuilder.sh.in

@@ -261,6 +261,8 @@ setup-vbootstrap(){
     ARCHIVES_DIR=${BUILD_ROOT}/var/cache/apt/archives
     CACHE_DIR=${VBOOTSTRAP_DIR}/cache/${VERSION}/apt/archives
 
+    __chroot_sh="/usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c"
+
     mkdir -p $VBOOTSTRAP_DIR
 }
 
@@ -290,8 +292,7 @@ apt-get-update(){
 	    ;;
 	--chroot)
 	    echo -n "apt-get update on chroot ... "
-	    /usr/sbin/chroot ${BUILD_ROOT} \
-		/bin/sh -c 'apt-get update' > /dev/null 2>&1
+	    $__chroot_sh 'apt-get update' > /dev/null 2>&1
 	    echo "done."
 	    ;;
 	*)
@@ -405,40 +406,33 @@ Build(){
     # mount_tmp
     # mount_home
 
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c 'apt-get update && apt-get -y dist-upgrade'
+    $__chroot_sh 'apt-get update && apt-get -y dist-upgrade'
 
     ##!! 4.2 has no apt-sourceslist-{plus,nonfree} packages
     if [ "$(echo ${VERSION} | sed s/_i386//)" != "4.2" ]; then
-	/usr/sbin/chroot ${BUILD_ROOT} \
-	    /bin/sh -c 'apt-get update && apt-get -y install apt-sourceslist-plus'
-	/usr/sbin/chroot ${BUILD_ROOT} \
-	    /bin/sh -c 'apt-get update && apt-get -y install apt-sourceslist-nonfree'
+	$__chroot_sh 'apt-get update && apt-get -y install apt-sourceslist-plus'
+	$__chroot_sh 'apt-get update && apt-get -y install apt-sourceslist-nonfree'
     fi
 
     if [ $with_dist_upgrade -eq 1 ]; then
-	/usr/sbin/chroot ${BUILD_ROOT} \
-	    /bin/sh -c 'apt-get update && apt-get -y dist-upgrade'
+	$__chroot_sh 'apt-get update && apt-get -y dist-upgrade'
     fi
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c 'apt-get -y install build-essential'
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c 'apt-get -y install self-build-setup'
+    $__chroot_sh 'apt-get -y install build-essential'
+    $__chroot_sh 'apt-get -y install self-build-setup'
 
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c 'apt-get -y install etcskel shadow-utils'
+    $__chroot_sh 'apt-get -y install etcskel shadow-utils'
 
-    /usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c 'cd /dev && /sbin/MAKEDEV console'
-    /usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c 'cd /dev && /sbin/MAKEDEV null'
-    /usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c 'cd /dev && /sbin/MAKEDEV zero'
+    $__chroot_sh 'cd /dev && /sbin/MAKEDEV console'
+    $__chroot_sh 'cd /dev && /sbin/MAKEDEV null'
+    $__chroot_sh 'cd /dev && /sbin/MAKEDEV zero'
 
-    /usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c '/usr/sbin/pwconv'
-    /usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c "/usr/sbin/useradd ${BUILD_USER}"
+    $__chroot_sh '/usr/sbin/pwconv'
+    $__chroot_sh "/usr/sbin/useradd ${BUILD_USER}"
 
     ##!! for rpm-4.8.0 or higher
     ##!! (See http://trac.vinelinux.org/wiki/Vine6/AboutUpdateToolchain)
     if [ "$(echo ${VERSION} | sed -e "s/\(VineSeed\).*/\1/")" = "VineSeed" ]; then
-	/usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c "sed -i -e 's/^%_topdir/#%_topdir/' /home/${BUILD_USER}/.rpmmacros"
+	$__chroot_sh "sed -i -e 's/^%_topdir/#%_topdir/' /home/${BUILD_USER}/.rpmmacros"
     fi
 
     # mount_home --umount
@@ -459,8 +453,7 @@ RPM_Remove(){
 	Msg_NotPackageName_$LOCALE
 	exit 1
     fi
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c "apt-get -y remove $BASE_RPM_PKG"
+    $__chroot_sh "apt-get -y remove $BASE_RPM_PKG"
 
     mount_vfs --umount
     mount_cache_dir --umount
@@ -473,8 +466,7 @@ RPM_Install(){
     mount_vfs
     apt-get-update --chroot
 
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c "cd ${BUILD_DIR} && apt-get -y install $BASE_RPM_PKG"
+    $__chroot_sh "cd ${BUILD_DIR} && apt-get -y install $BASE_RPM_PKG"
 
     mount_vfs --umount
     mount_cache_dir --umount
@@ -499,22 +491,17 @@ RPM_Build(){
 	RPM_PKG_ARCH_LIST="RPMS/${TARGET} ${RPM_PKG_ARCH_LIST}"
 
     ## make src.rpm for $VERSION
-    /usr/sbin/chroot ${BUILD_ROOT} \
-    	/bin/sh -c "cd ${BUILD_DIR} && su ${BUILD_USER} -c 'rpm -ivh $BASE_RPM_PKG'"
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c "cd ${BUILD_DIR} && su ${BUILD_USER} -c 'rpmbuild -bs --nodeps --clean --rmsource --rmspec ${BUILD_DIR}/SPECS/*.spec'"
+    $__chroot_sh "cd ${BUILD_DIR} && su ${BUILD_USER} -c 'rpm -ivh $BASE_RPM_PKG'"
+    $__chroot_sh "cd ${BUILD_DIR} && su ${BUILD_USER} -c 'rpmbuild -bs --nodeps --clean --rmsource --rmspec ${BUILD_DIR}/SPECS/*.spec'"
 
 
     ## change ${DIST_RELEASE}
     BASE_RPM_PKG=$(echo $BASE_RPM_PKG | sed -e "s/vl\([0-9]*\)\./vl${DIST_RELEASE}\./")
 
     ## rebuild $BASE_RPM_PKG on ${DIST_RELEASE}
-    /usr/sbin/chroot ${BUILD_ROOT} \
-    	/bin/sh -c "cd ${BUILD_DIR}/SRPMS && apt-get -y build-dep $BASE_RPM_PKG"
-    /usr/sbin/chroot ${BUILD_ROOT} \
-    	/bin/sh -c "cd ${BUILD_DIR}/SRPMS && su ${BUILD_USER} -c 'rpmbuild --rebuild $RPM_OPTS $BASE_RPM_PKG'"
-    /usr/sbin/chroot ${BUILD_ROOT} \
-	/bin/sh -c "cd ${BUILD_DIR} && apt-get -y install $(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s@${BUILD_ROOT}@@g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g')"
+    $__chroot_sh "cd ${BUILD_DIR}/SRPMS && apt-get -y build-dep $BASE_RPM_PKG"
+    $__chroot_sh "cd ${BUILD_DIR}/SRPMS && su ${BUILD_USER} -c 'rpmbuild --rebuild $RPM_OPTS $BASE_RPM_PKG'"
+    $__chroot_sh "cd ${BUILD_DIR} && apt-get -y install $(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s@${BUILD_ROOT}@@g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g')"
 
     ## copy built rpms to ${HOME}/rpm/ for each archtectures
     echo "Copying built rpms to ${HOME}/rpm/ for each archtectures ... "