vbuilder.sh.in: corrected some if conditions

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

vbootstrap.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.4
+%define version 0.0.5
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -59,6 +59,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Xxx Xxx XX 2009 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.5-1
+- updated vbuilder.sh.in
+
 * Sun Sep 13 2009 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.4-1
 - added vine-release in BASE_PKGS of scripts/*
 - added vbuilder.conf

vbuilder.sh.in

@@ -65,14 +65,13 @@ Msg_NoSupportVERSION_ja(){
 
 setup-vbuilder(){
     ## load default settings
-    if [ -d /etc/vbootstrap/vbuilder.conf ]; then
+    if [ -r /etc/vbootstrap/vbuilder.conf ]; then
 	. /etc/vbootstrap/vbuilder.conf
-    else
-	[ -z "${VBOOTSTRAP_DIR}" ] && \
-	    VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
-	[ -z "${DEFAULT_VERSION}" ] && \
-	    DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
     fi
+    [ -z "${VBOOTSTRAP_DIR}" ] && \
+	VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
+    [ -z "${DEFAULT_VERSION}" ] && \
+	DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
     [ -d $VBOOTSTRAP_DIR ] || mkdir -p $VBOOTSTRAP_DIR
     VERSION=$DEFAULT_VERSION