X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fwrapdoze.sh;h=d7432835e403dedaf5ea505f3aa490ca6f1c67c2;hb=7f9b0fd36ab70eed1b3dbbb485f3f0158514688a;hp=99d610ca29018d6b04c6d9c5e946d134abb48784;hpb=46198a8a6081484e0e452a3a47c8bec10f254487;p=feisty_meow.git diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh old mode 100644 new mode 100755 index 99d610ca..d7432835 --- a/scripts/generator/wrapdoze.sh +++ b/scripts/generator/wrapdoze.sh @@ -1,24 +1,48 @@ #!/bin/bash -source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" +source $FEISTY_MEOW_SCRIPTS/core/functions.sh -declare -a commands=() - -for i in "$@"; do - # we only mess with the command line on windows. - if [ "$OS" == "Windows_NT" ]; then - commands+=($(msys_to_dos_path $i)) - else - commands+=("$i") +function dossify_and_run_commands() +{ + # we only mess with the command line on windows... + if [ "$OS" != "Windows_NT" ]; then + # for non windows, just run the commands straight up. + $* + return $? fi -done -# echo commands are now: -# for i in "${commands[@]}"; do -# echo $i -# done + declare -a darc_commands=() + + for i in "$@"; do + if [[ "$i" =~ ^-[a-zA-z][/\"].* ]]; then + flag="${i:0:2}" + filename="$(unix_to_dos_path ${i:2})" +#echo "first two chars are $flag" +#echo "last after that are $filename" + recombined="$flag$filename" +#echo combined flag and file is $recombined + darc_commands+=("$recombined") + else + darc_commands+=($(unix_to_dos_path $i)) + fi + done + + declare -a real_commands=() + for i in "${darc_commands[@]}"; do + real_commands+=($(echo $i | sed -e 's/\\/\\\\/g')) + done + +#temp! + echo commands are now: + for i in "${real_commands[@]}"; do + echo -n "$i " + done + echo +#end temp -# now actually run the possibly chewed command. -"${commands[@]}" + # now actually run the chewed command. + cmd /c "${real_commands[@]}" +} +dossify_and_run_commands "$@"