r3195 - in jhalfs/trunk: . BLFS common optimize

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Mon Oct 23 19:49:38 PDT 2006


Author: georgeb
Date: 2006-10-23 20:49:37 -0600 (Mon, 23 Oct 2006)
New Revision: 3195

Modified:
   jhalfs/trunk/BLFS/gen_pkg_book.sh
   jhalfs/trunk/blfs-tool
   jhalfs/trunk/common/func_validate_configs.sh
   jhalfs/trunk/jhalfs
   jhalfs/trunk/optimize/optimize_functions
Log:
more changes made to accomodate bash-3.2

Modified: jhalfs/trunk/BLFS/gen_pkg_book.sh
===================================================================
--- jhalfs/trunk/BLFS/gen_pkg_book.sh	2006-10-19 17:27:18 UTC (rev 3194)
+++ jhalfs/trunk/BLFS/gen_pkg_book.sh	2006-10-24 02:49:37 UTC (rev 3195)
@@ -56,7 +56,7 @@
                       continue ;;
     esac
 
-    if [[ "${REPLY}" =~ "^CONFIG_" ]]; then
+    if [[ "${REPLY}" =~ ^CONFIG_ ]]; then
       echo -n "$REPLY"
       if [[ $((++cntr)) > 1 ]]; then
         echo "  <<-- ERROR SELECT ONLY 1 PACKAGE AT A TIME, WILL NOT BUILD"
@@ -107,7 +107,7 @@
 
     # Drop the "=y"
     REPLY=${REPLY%=*}
-    if [[ "${REPLY}" =~ "^DEP_" ]]; then
+    if [[ "${REPLY}" =~ ^DEP_ ]]; then
       META_PACKAGE=$(echo $REPLY | cut -d "_" -f2 | tr [A-Z] [a-z])
       DEP_FNAME=$(echo $REPLY | cut -d "_" -f3)
        echo "${DEP_FNAME}" >>libs/${META_PACKAGE}.dep-MOD

Modified: jhalfs/trunk/blfs-tool
===================================================================
--- jhalfs/trunk/blfs-tool	2006-10-19 17:27:18 UTC (rev 3194)
+++ jhalfs/trunk/blfs-tool	2006-10-24 02:49:37 UTC (rev 3195)
@@ -38,7 +38,7 @@
 simple_error() {        # Basic error trap.... JUST DIE
 #-----------------------#
   # If +e then disable text output
-  if [[ "$-" =~ "e" ]]; then
+  if [[ "$-" =~ e ]]; then
     echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2
   fi
 }

Modified: jhalfs/trunk/common/func_validate_configs.sh
===================================================================
--- jhalfs/trunk/common/func_validate_configs.sh	2006-10-19 17:27:18 UTC (rev 3194)
+++ jhalfs/trunk/common/func_validate_configs.sh	2006-10-24 02:49:37 UTC (rev 3195)
@@ -159,7 +159,7 @@
       SRC_ARCHIVE) [[ "$GETPKG" = "y" ]] && validate_dir -z+ -d -w+ ;;
         # The build directory/partition MUST exist and be writable by the user
       BUILDDIR)   validate_dir -z -d -w
-                  [[ "xx x/x" =~ "x${!config_param}x" ]] && write_error_and_die ;;
+                  [[ "xx x/x" =~ x${!config_param}x ]] && write_error_and_die ;;
 
         # Validate files, testable states:
         #  fatal   -z -e -s -w -x -r,

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2006-10-19 17:27:18 UTC (rev 3194)
+++ jhalfs/trunk/jhalfs	2006-10-24 02:49:37 UTC (rev 3195)
@@ -36,7 +36,7 @@
 simple_error() {        # Basic error trap.... JUST DIE
 #-----------------------#
   # If +e then disable text output
-  if [[ "$-" =~ "e" ]]; then
+  if [[ "$-" =~ e ]]; then
     echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2
   fi
 }

Modified: jhalfs/trunk/optimize/optimize_functions
===================================================================
--- jhalfs/trunk/optimize/optimize_functions	2006-10-19 17:27:18 UTC (rev 3194)
+++ jhalfs/trunk/optimize/optimize_functions	2006-10-24 02:49:37 UTC (rev 3195)
@@ -75,7 +75,7 @@
   local pkg=$1
   local MKF
 
-  if [[ "$BLACK_LIST" =~ "$pkg" ]]; then
+  if [[ "$BLACK_LIST" =~ ${pkg} ]]; then
     MKF=unset
   else
     MKF=$MAKEFLAGS




More information about the alfs-log mailing list