X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fwrapdoze.sh;h=d38b432b2c229f414f60249099ff3b8d55c0cbba;hb=7c7d191539d4e5a94c4b39433e32b05deab44f24;hp=c28d0e722e68afe0e8b28f39f7bb85988ae3776c;hpb=1874b84e75a13d5959f4713734ff40dcc5d37581;p=feisty_meow.git diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh index c28d0e72..d38b432b 100644 --- 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. @@ -18,6 +18,7 @@ function dossify_environment_variable() 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 +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 @@ -74,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 " @@ -96,8 +97,7 @@ 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 has: $(cat "$cmdfile")" +#echo "**** cmd file is $cmdfile" cmd /c $(cat "$cmdfile") retval=$? # leave the file for inspection if there was an error.