Changeset 267 for trunk/libjdkmidi/trunk

Timestamp:

01/20/07 21:34:11 (22 months ago)

Author:

jeffk@…

Message:

proper, or at least better sed script quoting rules for variables

Files:

• trunk/libjdkmidi/trunk/configure (modified) (2 diffs)

trunk/libjdkmidi/trunk/configure

@@ -87 +87 @@
 # into a single instance of awk so it is quick.
 #
-# The awk script extracts the variable name as $1, and the part after the '=' as $2. 
+# The awk script extracts the variable name as var, and the part after the first '=' as val
 # It changes - to _, -- to nothing, converts the string to uppercase, prefixes the
-# variable name with magic_, and prints $2 inside quotes.
-#
-# The result of the awk script is then a multi-line bash script which sets a bunch of environment
-# variables.  This text is then 'eval'd so ultimately the command line arguments show up as vars,
-# with out needing ugly getopt bash extensions for parsing command lines.
-
-params=`(
-  for i in "$@"
+# variable name with magic_, and prints val inside quotes.
+#
+
+for i in "$@"
   do 
-    echo $i
-  done
-) | awk '{  line=$0; i = index($0,"="); var = substr(line,0,i); val = substr(line,i+1); gsub("-","_",var); sub("__","",var); print "magic_" toupper(var) "=" "\"" val "\""; }'; `
-
-eval $params
+    p=`echo $i | awk '{  line=$0; i = index($0,"="); var = substr(line,0,i-1); val = substr(line,i+1); gsub("-","_",var); sub("__","",var); print "magic_" toupper(var) "=\"" val "\"\n"; }' `
+    eval $p
+done
+
+
 
 # setup all defaults:
@@ -217 +213 @@
 
 
+
 # extract all environment vars with the "magic_" prefix and save them in vars.sh and GNUmakefile in the appropriate form:
-set | grep '^magic_' | sed "s/'//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=\"" substr($0,i+1) "\"" }' >vars.sh
+set | grep '^magic_' | sort | sed "s/magic_\(.*\)=[\']*\([^']*\)[\']*/\1=\"\2\"/" >vars.sh
 echo ". \"${magic_PROJECT_TOP_DIR}/project.sh\"" >>vars.sh
-set | grep '^magic_' | sed "s/[\"']//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=" substr($0,i+1)  }' >GNUmakefile
+set | grep '^magic_' | sort | sed "s/magic_\(.*\)=[\']*\([^']*\)[\']*/\1=\2/" >GNUmakefile
+
+
 
 echo 'include $(CONFIGURE_DIR)/project.mak' >>GNUmakefile