Rename IS_MINGW_CYGWIN to IS_WINDOWS, simpler

This commit is contained in:
Steve Streeting 2015-10-20 15:27:47 +01:00
parent 49bf10dbd9
commit 0c2ad37f74
2 changed files with 3 additions and 3 deletions

@ -50,10 +50,10 @@ TESTHOME="$REMOTEDIR/home"
GIT_CONFIG_NOSYSTEM=1 GIT_CONFIG_NOSYSTEM=1
UNAME=$(uname -s) UNAME=$(uname -s)
IS_MINGW_CYGWIN=0 IS_WINDOWS=0
if [[ $UNAME == MINGW* || $UNAME == CYGWIN* ]] if [[ $UNAME == MINGW* || $UNAME == CYGWIN* ]]
then then
IS_MINGW_CYGWIN=1 IS_WINDOWS=1
fi fi
export CREDSDIR export CREDSDIR

@ -387,7 +387,7 @@ get_date() {
# Needed to match generic built paths in test scripts to native paths generated from Go # Needed to match generic built paths in test scripts to native paths generated from Go
native_path() { native_path() {
local arg=$1 local arg=$1
if [ $IS_MINGW_CYGWIN == "1" ]; then if [ $IS_WINDOWS == "1" ]; then
# Use params form to avoid interpreting any '\' characters # Use params form to avoid interpreting any '\' characters
printf '%s' "$(cygpath -w $arg)" printf '%s' "$(cygpath -w $arg)"
else else