From 01b46966dd81886d843a35e1a6960d8d07dee89e Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 29 Apr 2013 13:21:25 -0400 Subject: [PATCH] in progress to support windows builds. --- scripts/generator/wrapdoze.sh | 47 +++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 21 deletions(-) mode change 100644 => 100755 scripts/generator/wrapdoze.sh diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh old mode 100644 new mode 100755 index 758fc762..a4062987 --- 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})" - -#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") + if [[ "$i" =~ ^-[a-zA-z][/\"].* ]]; then +echo found parameter to fix... + 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: >>/tmp/wrapdoze.log - for i in "${darc_commands[@]}"; do + for i in "${real_commands[@]}"; do echo $i >>/tmp/wrapdoze.log done #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 "$@" -- 2.34.1