Source Mage code commit list

[Thomas Orgis <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 smgl/smgl-archspecs/FINAL          |   11 +++++------
 smgl/smgl-archspecs/HISTORY        |    1 +
 smgl/smgl-archspecs/POST_RESURRECT |   11 +++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 0fa22b89953ca0b9d76a37b1c64fbb2ba2073f29
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    make archspecs not rely on bash-3 regex feature for the FINAL code

diff --git a/smgl/smgl-archspecs/FINAL b/smgl/smgl-archspecs/FINAL
index be67bd7..d8044ee 100755
--- a/smgl/smgl-archspecs/FINAL
+++ b/smgl/smgl-archspecs/FINAL
@@ -7,13 +7,12 @@
 
 message "current arch: $ARCHITECTURE" &&
 
-# these regexes did work with bash 3.1, should work since 3.0
-
 # only act if we are going to modify the host system's archspecs
-if [[ "$INSTALL_ROOT" =~ '^/*$' ]]; then
+if echo "$INSTALL_ROOT" | grep -q '^/*$'; then
   message "checking if your architecture setting needs fixing..." &&
-  if [[ "$ARCHITECTURE" =~ '^(.*)_minimal$' ]]; then
-    message "going to fix your architecture setting to ${BASH_REMATCH[1]}" &&
-    modify_local_config "ARCHITECTURE" "${BASH_REMATCH[1]}"
+  if echo "$ARCHITECTURE" | grep -q '_minimal$'; then
+    new_arch=`echo "$ARCHITECTURE" | sed 's/_minimal$//'` &&
+    message "going to fix your architecture setting to $new_arch" &&
+    modify_local_config "ARCHITECTURE" "$new_arch"
   fi
 fi
diff --git a/smgl/smgl-archspecs/HISTORY b/smgl/smgl-archspecs/HISTORY
index be5d9e2..ceacc9b 100644
--- a/smgl/smgl-archspecs/HISTORY
+++ b/smgl/smgl-archspecs/HISTORY
@@ -3,6 +3,7 @@
          Core 2
        * INSTALL: fix for tarball layout straight out of git
          (no archspecs subfolder)
+       * FINAL,POST_RESURRECT: do not use bash-3 features... 
 
 2007-01-23 Thomas Orgis <sobukus AT sourcemage.org>
        * FINAL, POST_RESURRECT: addressing bug 13455, changing _minimal
diff --git a/smgl/smgl-archspecs/POST_RESURRECT 
b/smgl/smgl-archspecs/POST_RESURRECT
index be67bd7..d8044ee 100755
--- a/smgl/smgl-archspecs/POST_RESURRECT
+++ b/smgl/smgl-archspecs/POST_RESURRECT
@@ -7,13 +7,12 @@
 
 message "current arch: $ARCHITECTURE" &&
 
-# these regexes did work with bash 3.1, should work since 3.0
-
 # only act if we are going to modify the host system's archspecs
-if [[ "$INSTALL_ROOT" =~ '^/*$' ]]; then
+if echo "$INSTALL_ROOT" | grep -q '^/*$'; then
   message "checking if your architecture setting needs fixing..." &&
-  if [[ "$ARCHITECTURE" =~ '^(.*)_minimal$' ]]; then
-    message "going to fix your architecture setting to ${BASH_REMATCH[1]}" &&
-    modify_local_config "ARCHITECTURE" "${BASH_REMATCH[1]}"
+  if echo "$ARCHITECTURE" | grep -q '_minimal$'; then
+    new_arch=`echo "$ARCHITECTURE" | sed 's/_minimal$//'` &&
+    message "going to fix your architecture setting to $new_arch" &&
+    modify_local_config "ARCHITECTURE" "$new_arch"
   fi
 fi