vbuilder.sh.in: dropped the action "show-info"

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

Makefile

@@ -16,7 +16,9 @@ all:
 	sed -e "s/@@VBOOTSTRAP_VERSION@@/${VERSION}/g" \
 		vbootstrap.sh.in > vbootstrap.sh
 	for i in vbuilder.sh.in vbuilder.conf.in libvbuilder.sh.in; do \
-	  sed -e "s/@@VBUILDER_STABLE_VERSION@@/${VBUILDER_STABLE_VERSION}/g" \
+	  sed -e "s/@@VBUILDER_VERSION@@/${VERSION}/g" \
+	      -e "s/@@VBUILDER_REVISION@@/${REVISION}/g" \
+	      -e "s/@@VBUILDER_STABLE_VERSION@@/${VBUILDER_STABLE_VERSION}/g" \
 	      -e "s/@@VBUILDER_DEFAULT_VERSION@@/${VBUILDER_DEFAULT_VERSION}/g" \
 	      -e "s/@@VBUILDER_CATEGORIES@@/${VBUILDER_CATEGORIES}/g" \
 	      -e "s|@@VBUILDER_VBOOTSTRAP_DIR@@|${VBUILDER_VBOOTSTRAP_DIR}|g" \

vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.42
+%define version 0.0.43
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -80,6 +80,10 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Sat Apr 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.43-1
+- updated vbuilder.sh.in
+  - dropped the action "show-info"
+
 * Sat Apr 16 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.42-1
 - fixed RPM_Sign(), Login_Chroot() in vbuilder.sh.in
   - the command "vbuilder clean" returns 0. 

vbuilder.sh.in

@@ -13,7 +13,8 @@ Usage(){
     esac
 
     cat<<EOF
-Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-define [macro_expr]} {--rpmbuild-with [bcond_with]} {--rpmbuild-without [bcond_with]} {--sign} {--no-install} {--debug} {--help} {--bootstrap-dir [directory]} {--unionfs-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}
+$(basename $0) @@VBUILDER_VERSION@@ $(echo $([ -z "@@VBUILDER_REVISION@@" ] || echo "(r@@VBUILDER_REVISION@@)"))
+Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-define [macro_expr]} {--rpmbuild-with [bcond_with]} {--rpmbuild-without [bcond_with]} {--sign} {--no-install} {--debug} {--help} {--bootstrap-dir [directory]} {--unionfs-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]}
 
 Options:
 	--version:		set [version] (default: ${DEFAULT_VERSION})
@@ -42,7 +43,6 @@ Actions:
 	build-rpm:		build [src.rpm] on a boostrap
 	install-rpm:		install [arch.rpm|package] on a boostrap
 	remove-rpm:		remove [package] on a boostrap
-	show-info:		show basic informations and logs in chroot
 
 For example, 
 * make a clean/plain build environment on the current archtecture:
@@ -89,7 +89,7 @@ check-parameter(){
 		shift
 		check-next-parameter $1 || return 1
 		;;
-	    --build|build|--clean|clean|--show-info|show-info)
+	    --build|build|--clean|clean)
 		with_actions=1
 		;;
 	    *)
@@ -179,6 +179,7 @@ setup-vbootstrap(){
 
 	## check debug mode
 	[ ${with_debug} -eq 1 ] && \
+	    cat $VBUILDER_CONF && \
 	    set && set -x
 
 	## check some directories
@@ -319,7 +320,6 @@ setup-vbootstrap(){
     UNIONFS_ROOT=${UNIONFS_DIR}/${VERSION}
     ARCHIVES_DIR=${BUILD_ROOT}/var/cache/apt/archives
     EXTERNAL_ARCHIVES_DIR=${CACHE_DIR}/${VERSION}/apt/archives
-    VBUILDER_LOG=${BUILD_ROOT}/var/log/vbuilder.log
 
     __chroot_sh="/usr/sbin/chroot ${BUILD_ROOT} /bin/sh -c -l"
 
@@ -490,45 +490,6 @@ mount-chroot-mount(){
     return 0
 }
 
-write-vbuilder-log(){
-    HRULE="======================================================================"
-
-    [ -d ${BUILD_ROOT} ] || return 1
-
-    if [ ! -f $VBUILDER_LOG ]; then
-	cat<<EOF > $VBUILDER_LOG
-${HRULE}
-VBUILDER REPORT
-DATE:		$(LANG=C date)
-HOSTNAME:	$(hostname)
-OS:		$(echo $($__chroot_sh "cat /etc/vine-release"))
-%_arch:		$(echo $($__chroot_sh "rpm --eval %_arch"))
-
---version: ${VERSION}
-$(echo $([ -z "${VARCH}" ] || echo "--arch: ${VARCH}"))
-$(echo $([ -z "${CATEGORIES}" ] || echo "--category: ${CATEGORIES}"))
-$(echo $([ $with_dist_upgrade -eq 1 ] && echo "--dist-upgrade"))
-$(echo $([ $with_unionfs -eq 1 ] && echo "--unionfs"))
-$(echo $([ -z "${TARGET}" ] || echo "--target: ${TARGET}"))
---bootstrap-dir: ${VBOOTSTRAP_DIR}
---unionfs-dir: ${UNIONFS_DIR}
---cache-dir: ${CACHE_DIR}
---built-rpms-dir: ${BUILT_RPMS_DIR}
-${HRULE}
-
-[$VBUILDER_CONF]
-$(cat $VBUILDER_CONF)
-
-[History]
-EOF
-    else
-	cat<<EOF >> $VBUILDER_LOG
-$*
-EOF
-    fi
-
-    return 0
-}
 
 ##############################################################################
 
@@ -647,10 +608,6 @@ Build(){
 	$__chroot_sh "sed -i -e 's/^%_topdir/#%_topdir/' /home/${BUILD_USER}/.rpmmacros"
     fi
 
-    ## output basic informations in chroot
-    write-vbuilder-log
-    write-vbuilder-log "build"
-
     # mount-chroot --umount /home
     # mount-chroot --umount /tmp
     mount-chroot --umount /dev/shm
@@ -663,14 +620,6 @@ Build(){
     return 0
 }
 
-Show-Info(){
-    setup-vbootstrap || return 1
-
-    [ -f $VBUILDER_LOG ] && cat $VBUILDER_LOG
-
-    return 0
-}
-
 RPM_Remove(){
     setup-vbootstrap-rpm || return 1
     mount-chroot unionfs_dir
@@ -684,8 +633,6 @@ RPM_Remove(){
 	echo $"E: $RPM_PKG is not a package name" && return 1
     $__chroot_sh "apt-get -y remove $BASE_RPM_PKG"
 
-    write-vbuilder-log "remove-rpm $RPM_PKG"
-
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
     mount-chroot --umount /proc
@@ -708,8 +655,6 @@ RPM_Install(){
 
     $__chroot_sh "cd ${BUILD_DIR} && apt-get -y install $BASE_RPM_PKG"
 
-    write-vbuilder-log "install-rpm $RPM_PKG"
-
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
     mount-chroot --umount /proc
@@ -765,8 +710,6 @@ RPM_Build(){
 	fi
     done
 
-    write-vbuilder-log "build-rpm $RPM_PKG"
-
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
     mount-chroot --umount /proc
@@ -854,7 +797,7 @@ while [ $# -gt 0 ]; do
 	--build-rpm|build-rpm|--install-rpm|install-rpm|--remove-rpm|remove-rpm)
 	    shift
 	    ;;
-	--build|build|--clean|clean|--show-info|show-info)
+	--build|build|--clean|clean)
 	    ;;
 	*)
 	    echo unknown option $1
@@ -930,9 +873,6 @@ while [ $# -gt 0 ]; do
 	    RPM_PKG=$1
 	    RPM_Remove || exit 1
 	    ;;
-	--show-info|show-info)
-	    Show-Info || exit 1
-	    ;;
 	--build|build)
 	    Build || exit 1
 	    ;;