Changeset a96109a

Timestamp:

10/24/2006 02:49:37 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

6e8fc82

Parents:

a16f769

Message:

more changes made to accomodate bash-3.2

Files:

• BLFS/gen_pkg_book.sh (modified) (2 diffs)
• blfs-tool (modified) (1 diff)
• common/func_validate_configs.sh (modified) (1 diff)
• jhalfs (modified) (1 diff)
• optimize/optimize_functions (modified) (1 diff)

BLFS/gen_pkg_book.sh

@@ -57 +57 @@
     esac
 
-    if [[ "${REPLY}" =~ "^CONFIG_" ]]; then
+    if [[ "${REPLY}" =~ ^CONFIG_ ]]; then
       echo -n "$REPLY"
       if [[ $((++cntr)) > 1 ]]; then
@@ -108 +108 @@
     # 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)

blfs-tool

@@ -39 +39 @@
 #-----------------------#
   # 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

common/func_validate_configs.sh

@@ -160 +160 @@
         # 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:

jhalfs

@@ -37 +37 @@
 #-----------------------#
   # 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

optimize/optimize_functions

@@ -76 +76 @@
   local MKF
 
-  if [[ "$BLACK_LIST" =~ "$pkg" ]]; then
+  if [[ "$BLACK_LIST" =~ ${pkg} ]]; then
     MKF=unset
   else