r2438 - in jhalfs/branches/experimental: . common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Mar 28 10:21:48 PST 2006


Author: manuel
Date: 2006-03-28 11:21:47 -0700 (Tue, 28 Mar 2006)
New Revision: 2438

Modified:
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/master.sh
Log:
Added verbosity envar.

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-28 18:07:54 UTC (rev 2437)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-28 18:21:47 UTC (rev 2438)
@@ -122,7 +122,6 @@
 }
 
 version="
-
 ${BOLD}  \"jhalfs-X\"${OFF} builder tool (development) \$Rev$
 \$Date$
 

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-03-28 18:07:54 UTC (rev 2437)
+++ jhalfs/branches/experimental/master.sh	2006-03-28 18:21:47 UTC (rev 2438)
@@ -41,32 +41,33 @@
 
      PROGNAME=$(basename $0)
    COMMON_DIR="common"
-   PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z])
+  PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z])
        MODULE=$PACKAGE_DIR/master.sh
 MODULE_CONFIG=$PACKAGE_DIR/config
+    VERBOSITY=0
 
-echo -n "Loading common-functions module..."
+[[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..."
 source $COMMON_DIR/common-functions
 [[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit
-echo "OK"
+[[ $VERBOSITY > 0 ]] && echo "OK"
 #
 
-echo -n "Loading masterscript conf..."
+[[ $VERBOSITY > 0 ]] && echo -n "Loading masterscript conf..."
 source $COMMON_DIR/config
 [[ $? > 0 ]] && echo "$COMMON_DIR/conf did not load.." && exit
-echo "OK"
+[[ $VERBOSITY > 0 ]] && echo "OK"
 #
-echo -n "Loading config module <$MODULE_CONFIG>..."
+[[ $VERBOSITY > 0 ]] && echo -n "Loading config module <$MODULE_CONFIG>..."
 source $MODULE_CONFIG
 [[ $? > 0 ]] && echo "$MODULE_CONFIG did not load.." && exit 1
-echo "OK"
+[[ $VERBOSITY > 0 ]] && echo "OK"
 #
-echo -n "Loading code module <$MODULE>..."
+[[ $VERBOSITY > 0 ]] && echo -n "Loading code module <$MODULE>..."
 source $MODULE
 [[ $? > 0 ]] && echo "$MODULE did not load.." && exit 2
-echo "OK"
+[[ $VERBOSITY > 0 ]] && echo "OK"
 #
-echo "---------------${nl_}"
+[[ $VERBOSITY > 0 ]] && echo "---------------${nl_}"
 
 
 #===========================================================
@@ -78,16 +79,16 @@
 
 
 #*******************************************************************#
-echo -n "Loading function <func_check_version.sh>..."
+[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
 source $COMMON_DIR/func_check_version.sh
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
-echo "OK"
+[[ $VERBOSITY > 0 ]] && echo "OK"
 
-echo -n "Loading function <func_validate_configs.sh>..."
+[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
 source $COMMON_DIR/func_validate_configs.sh
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
-echo "OK"
-echo "---------------${nl_}"
+[[ $VERBOSITY > 0 ]] && echo "OK"
+[[ $VERBOSITY > 0 ]] && echo "---------------${nl_}"
 
 
 ###################################




More information about the alfs-log mailing list