updated vbuilder.sh.in: added --no-install option

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

vbootstrap-vl.spec

@@ -78,6 +78,7 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 * Xxx Yyy Zz 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.29-1
 - updated vbuilder.sh.in
   - added --sign option
+  - added --no-install option
 
 * Fri Jun 04 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.28-1
 - updated vbuilder.sh.in

vbuilder-bash-completion.sh

@@ -22,7 +22,7 @@ _vbuilder()
     first="${COMP_WORDS[1]}"
 
     ## The basic options we'll complete.
-    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32"
+    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --sign --no-install"
     actions="clean build build-rpm install-rpm remove-rpm show-info"
     opts="$options $actions"
 

vbuilder.sh.in

@@ -3,7 +3,7 @@
 
 Usage_C(){
     cat<<EOF
-Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--sign} {--bootstrap-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]|show-info}
+Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--sign} {--no-install} {--bootstrap-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]|show-info}
 
 Options:
 	--version:		set [version] (default: ${DEFAULT_VERSION})
@@ -14,6 +14,7 @@ Options:
 	--target:		build rpms with [target]
 	--with-compat32:	build rpms with compat32 on boostrap
 	--sign:			sign built rpms
+	--no-install:		build only a source rpm - do NOT install a built rpm
 	--bootstrap-dir:	set a bootstrap directory (default: ${VBOOTSTRAP_DIR})
 	--cache-dir:		set a directory to cache rpms (default: ${CACHE_DIR})
 	--built-rpms-dir:	set a directory to store built rpms in chroot (default: ${BUILT_RPMS_DIR})
@@ -204,7 +205,7 @@ check-parameter(){
 		shift
 		check-next-parameter $1 || return 1
 		;;
-	    --dist-upgrade|--unionfs|--with-compat32|--sign)
+	    --dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
 		[ $with_actions -eq 1 ] && \
 		    Msg_GiveNoMoreOptions_$LOCALE && return 1
 		;;
@@ -274,6 +275,7 @@ setup-vbuilder(){
     with_dist_upgrade=0
     with_unionfs=0
     with_sign=0
+    with_no_install=0
     with_actions=0
     with_category_main=0
     with_category_plus=0
@@ -781,7 +783,8 @@ RPM_Build(){
     ## rebuild $BASE_RPM_PKG on ${DIST_RELEASE}
     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && apt-get -o APT::Install::Virtual=true -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')"
+    [ $with_no_install -eq 0 ] && \
+	$__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 ${BUILT_RPMS_DIR} for each archtectures ... "
@@ -832,7 +835,7 @@ while [ $# -gt 0 ]; do
 	--version|--arch|--category|--target|--bootstrap-dir|--cache-dir|--built-rpms-dir)
 	    shift
 	    ;;
-	--dist-upgrade|--unionfs|--with-compat32|--sign)
+	--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
 	    ;;
 	--build-rpm|build-rpm|--install-rpm|install-rpm|--remove-rpm|remove-rpm)
 	    shift
@@ -871,6 +874,9 @@ while [ $# -gt 0 ]; do
 	--sign)
 	    with_sign=1
 	    ;;
+	--no-install)
+	    with_no_install=1
+	    ;;
 	--bootstrap-dir)
 	    VBOOTSTRAP_DIR=$1
 	    ;;