X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fwrapdoze.sh;h=d38b432b2c229f414f60249099ff3b8d55c0cbba;hb=43099b0a5606877a692b484b58c807cf8ea20bd7;hp=b3a3dd1c61c75730e418e8bd35a5dd9dfded591f;hpb=6bac9446c8b7c594001ea05afc4b425a10a49113;p=feisty_meow.git

diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh
old mode 100755
new mode 100644
index b3a3dd1c..d38b432b
--- 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.
@@ -8,7 +8,13 @@ function dossify_environment_variable()
 {
   local var="$1"; shift
 
+#cygpath doesn't handle multiple path variables properly and otherwise operates only on one path element.
+##  new_value="$(cygpath -p -d ${!var})"
+##  eval "export $var=\"$new_value\""
+##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
@@ -21,8 +27,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
@@ -69,7 +75,7 @@ function dossify_and_run_commands()
     real_commands+=($(echo $i | sed -e 's/\//\\/g'))
   done
 
-  if [ ! -z "$SHELL_DEBUG" ]; then
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
     echo commands are now:
     for i in "${real_commands[@]}"; do
       echo -n "$i "
@@ -94,8 +100,10 @@ function dossify_and_run_commands()
 #echo "**** cmd file is $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
 }