tasty revision to load feisty for full use

[feisty_meow.git] / scripts / generator / wrapdoze.sh

diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh
index 3851aab9ecc172201347b4fe10ac92b2a4974a52..99f05ef949860a96fc8efcbcf19883ccfc25c8f6 100755 (executable)
--- a/scripts/generator/wrapdoze.sh
+++ b/scripts/generator/wrapdoze.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 #hmmm: make this support multiple vars as parameters.
 # replaces a specific environment variable with a dos approved equivalent.
@@ -14,10 +14,10 @@ function dossify_environment_variable()
 ##echo "hey now the var is '${!var}'"
 
   old_value="${!var}"
+#echo "var is '$var' and old value is '$old_value'"
   if [[ ! "$old_value" =~ \/cygdrive\/ ]]; then
 #echo didnt have a cygdrive in it: $old_value
     return 0
-#hmmm: want this to continue in multi parm version.
   fi
 
   # replace single back-slashes with double ones.
@@ -26,8 +26,8 @@ function dossify_environment_variable()
   # remove any quote characters in the value.
   new_value="${new_value//\"/}"
 
+echo "new value: '$var' = '$new_value'"
   eval "export $var=\"$new_value\""
-  echo "new value established: $var='${!var}'"
 }
 
 # for a windows build, this will replace any forward slashes
@@ -96,11 +96,14 @@ function dossify_and_run_commands()
 #new approach that creates a cmd file.
   cmdfile="$(mktemp $CLAM_TMP/build_cmds.XXXXXX)"
   echo "${real_commands[@]}" >"$cmdfile"
-#echo "**** cmd file is $cmdfile"
+echo "** cmd file is: '$cmdfile')"
+#echo "** cmd file has: $(cat "$cmdfile")"
   cmd /c $(cat "$cmdfile")
   retval=$?
-  rm "$cmdfile"
-
+  # leave the file for inspection if there was an error.
+  if [ $retval -eq 0 ]; then
+    \rm "$cmdfile"
+  fi
   return $retval
 }