Moved the ICA targets creation to func_ICA.sh

LFS/master.sh

@@ -399,13 +399,7 @@ EOF
 ) >> $MKFILE
 
   # Add the ICA targets
-  [[ "$RUN_ICA" != "0" ]] && \
-(
-    cat << EOF
-ICA_rebuild:  $ICA_rebuild
-
-EOF
-) >> $MKFILE
+  [[ "$RUN_ICA" != "0" ]] && wrt_ica_targets "$ICA_rebuild"
 
   # Bring over the items from the Makefile.tmp
   cat $MKFILE.tmp >> $MKFILE

common/func_ICA.sh

@@ -1,5 +1,17 @@
 # $Id$
 
+#----------------------------------#
+wrt_ica_targets() {                #
+#----------------------------------#
+  local ICA_rebuild=$1
+(
+    cat << EOF
+ICA_rebuild:  $ICA_rebuild
+
+EOF
+) >> $MKFILE
+}
+
 # Acknowledgment:
 #  The following code is a modified version of an original work written by
 #  Greg Schafer for the "DIY Linux" project and is included here with his

master.sh

@@ -51,12 +51,16 @@ source $COMMON_DIR/common-functions
 [[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
-
 [[ $VERBOSITY > 0 ]] && echo -n "Loading masterscript conf..."
 source $COMMON_DIR/config
 [[ $? > 0 ]] && echo "$COMMON_DIR/conf did not load.." && exit
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
+[[ $VERBOSITY > 0 ]] && echo -n "Loading ICA module..."
+source $COMMON_DIR/func_ICA.sh
+[[ $? > 0 ]] && echo "$COMMON_DIR/func_ICA.sh did not load.." && exit
+[[ $VERBOSITY > 0 ]] && echo "OK"
+#
 [[ $VERBOSITY > 0 ]] && echo -n "Loading config module <$MODULE_CONFIG>..."
 source $MODULE_CONFIG
 [[ $? > 0 ]] && echo "$MODULE_CONFIG did not load.." && exit 1