Changeset bb8e6bc

Timestamp:

05/05/2006 07:09:01 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

fb6b1c5

Parents:

eca59ce

Message:

Merged r2645 from trunk.

File:

• master.sh (modified) (2 diffs)

master.sh

@@ -57 +57 @@
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
-[[ $VERBOSITY > 0 ]] && echo -n "Loading optimization config..."
-source optimize/opt_config
-[[ $? > 0 ]] && echo " optimize/opt_config did not load.." && exit
-[[ $VERBOSITY > 0 ]] && echo "OK"
-#
-[[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..."
-source $COMMON_DIR/func_compare.sh
-[[ $? > 0 ]] && echo "$COMMON_DIR/func_compare.sh did not load.." && exit
-[[ $VERBOSITY > 0 ]] && echo "OK"
-#
 [[ $VERBOSITY > 0 ]] && echo -n "Loading config module <$MODULE_CONFIG>..."
 source $MODULE_CONFIG
@@ -465 +455 @@
 fi
 echo "${nl_}${SD_BORDER}${nl_}"
+
+# Loadd additional modules or configuration files based on global settings
+# compare module
+if [[ "$COMPARE" = "1" ]]; then
+  [[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..."
+  source $COMMON_DIR/func_compare.sh
+  [[ $? > 0 ]] && echo "$COMMON_DIR/func_compare.sh did not load.." && exit
+  [[ $VERBOSITY > 0 ]] && echo "OK"
+fi
+#
+# optimize configurations
+if [[ "$OPTIMIZE" != "0" ]]; then
+  [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization config..."
+  source optimize/opt_config
+  [[ $? > 0 ]] && echo " optimize/opt_config did not load.." && exit
+  [[ $VERBOSITY > 0 ]] && echo "OK"
+fi
+#
 
 # Prevents setting "-d /" by mistake.