projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.99'
[feisty_meow.git]
/
scripts
/
generator
/
wrapdoze.sh
diff --git
a/scripts/generator/wrapdoze.sh
b/scripts/generator/wrapdoze.sh
index b3a3dd1c61c75730e418e8bd35a5dd9dfded591f..d38b432b2c229f414f60249099ff3b8d55c0cbba 100755
(executable)
--- a/
scripts/generator/wrapdoze.sh
+++ b/
scripts/generator/wrapdoze.sh
@@
-1,6
+1,6
@@
#!/bin/bash
#!/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.
#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
{
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}"
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
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//\"/}"
# remove any quote characters in the value.
new_value="${new_value//\"/}"
-# echo "new value: $var = $new_value"
eval "export $var=\"$new_value\""
eval "export $var=\"$new_value\""
+ echo "new value established: $var='${!var}'"
}
# for a windows build, this will replace any forward slashes
}
# 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
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 "
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=$?
#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
}
return $retval
}