Repackage internal code into functions. (readability). Made cntr a local var as it was interfering with a trace

BLFS/gen_pkg_book.sh

@@ -4,8 +4,23 @@
 #
 #  Read and parse the configuration parameters..
 #
-ConfigFile="configuration"
-while [ 0 ]; do
+set -e
+
+declare -r ConfigFile="configuration"
+declare TARGET
+declare DEP_LEVEL
+declare SUDO
+declare PKGXML
+declare BLFS_XML
+declare VERBOSITY=1
+
+#--------------------------#
+parse_configuration() {    #
+#--------------------------#
+  local	cntr
+  local	optTARGET
+  
+  while [ 0 ]; do
     read || break 1
 
     # Garbage collection
@@ -50,18 +65,29 @@ while [ 0 ]; do
         optTARGET=$( echo $REPLY | sed -e 's@CONFIG_@@' -e 's@=y@@' )
       fi
     fi
-done <$ConfigFile
-if [[ $optTARGET = "" ]]; then
+  done <$ConfigFile
+  
+  if [[ $optTARGET = "" ]]; then
     echo -e "\n>>> NO TARGET SELECTED.. applicaton terminated"
     echo -e "    Run <make> again and select a package to build\n"
     exit 0
-fi
+  fi
+
+  TARGET=$optTARGET
+  DEP_LEVEL=$optDependency
+  SUDO=${SUDO:-y}
+}
+
 
 #
 # Regenerate the META-package dependencies from the configuration file
 #
-rm -f libs/*.dep-MOD
-while [ 0 ]; do
+#--------------------------#
+regenerate_deps() {        #
+#--------------------------#
+
+  rm -f libs/*.dep-MOD
+  while [ 0 ]; do
     read || break 1
     case ${REPLY} in
       \#* | '') continue ;;
@@ -75,23 +101,16 @@ while [ 0 ]; do
        echo "${DEP_FNAME}" >>libs/${META_PACKAGE}.dep-MOD
     fi
 
-done <$ConfigFile
-#
-# Replace to 'old' dependency file with a new one.
-#
-for dst in `ls ./libs/*.dep-MOD 2>/dev/null`; do
+  done <$ConfigFile
+  #
+  # Replace to 'old' dependency file with a new one.
+  #
+  for dst in `ls ./libs/*.dep-MOD 2>/dev/null`; do
     cp -vf $dst ${dst%-MOD}
-done
+  done
+}
 
 
-set -e
-declare TARGET=$optTARGET
-declare DEP_LEVEL=$optDependency
-declare PKGXML
-declare BLFS_XML
-declare VERBOSITY=1
-[[ -z $SUDO ]] && SUDO=y
-
 #---------------------
 # Constants
 source libs/constants.inc
@@ -115,6 +134,9 @@ if [[ ! -f packages ]] ; then
   exit 1
 fi
 
+
+parse_configuration
+regenerate_deps
 generate_dependency_tree
 generate_TARGET_xml
 generate_target_book