X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=41533fa1eb5e267fec2bdfb7d27fb1306a8c62ad;hb=f572426ee59be801010c446e72e4c60e4768712a;hp=912f545a3b6ff1bb481b0ffa88788481db723b01;hpb=5e997ee834aafee7bdb6c8fb0bad54702c75580b;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 912f545a..41533fa1 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -281,10 +281,12 @@ if [ -z "$skip_all" ]; then fi } - # switches from an X:/ form to an /X/path form. + # switches from an X:/ form to a /cygdrive/X/path form. this is only useful + # for the cygwin environment currently. function dos_to_unix_path() { # we always remove dos slashes in favor of forward slashes. - echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/' +#old: echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/' + echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/cygdrive\/\1\/\2/' } # returns a successful value (0) if this system is debian or ubuntu. @@ -487,7 +489,7 @@ if [ -z "$skip_all" ]; then actual_file="$(echo $intermediate_name | sed -e "s/'\([^']*\)'/\1/")" final_name="$(perl $FEISTY_MEOW_SCRIPTS/files/renlower.pl "$actual_file")" if [ -z "$final_name" ]; then - final_name="'$intermediate_name'" + final_name="$intermediate_name" else final_name="$(echo $final_name | sed -e 's/.*=> //')" fi