X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fwrapdoze.sh;h=d7432835e403dedaf5ea505f3aa490ca6f1c67c2;hb=2fdca9287111298b428cce91f789ef164799afef;hp=758fc76243fb27fcabfcd4575395243be446ecff;hpb=b51411a29f1a751a09e69f5676afeea24a94ac83;p=feisty_meow.git diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh old mode 100644 new mode 100755 index 758fc762..d7432835 --- a/scripts/generator/wrapdoze.sh +++ b/scripts/generator/wrapdoze.sh @@ -4,39 +4,44 @@ source $FEISTY_MEOW_SCRIPTS/core/functions.sh 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 + declare -a darc_commands=() for i in "$@"; do - # we only mess with the command line on windows. - if [ "$OS" == "Windows_NT" ]; then - if [[ "$i" =~ ^-[a-zA-z][/\"].* ]]; then -#echo matched on our pattern for parameters - flag="${i:0:2}" - filename="$(unix_to_dos_path ${i:2})" - + 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" -#combined="$flag$filename" -#echo combined is $combined - - darc_commands+=("$flag$filename") - else - darc_commands+=($(unix_to_dos_path $i)) - fi - else - darc_commands+=("$i") + recombined="$flag$filename" +#echo combined flag and file is $recombined + darc_commands+=("$recombined") + else + darc_commands+=($(unix_to_dos_path $i)) fi done -#temp! - echo commands are now: >>/tmp/wrapdoze.log + declare -a real_commands=() for i in "${darc_commands[@]}"; do - echo $i >>/tmp/wrapdoze.log + 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. - "${darc_commands[@]}" + # now actually run the chewed command. + cmd /c "${real_commands[@]}" } dossify_and_run_commands "$@"