X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=inline;f=scripts%2Fgenerator%2Fwrapdoze.sh;h=c28d0e722e68afe0e8b28f39f7bb85988ae3776c;hb=f8197f8c46475e04f678ea7832ab86157b9788d1;hp=3851aab9ecc172201347b4fe10ac92b2a4974a52;hpb=478592a729f51c71ce6a2af9913e2a65ba8105cf;p=feisty_meow.git diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh index 3851aab9..c28d0e72 100755 --- a/scripts/generator/wrapdoze.sh +++ b/scripts/generator/wrapdoze.sh @@ -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 }