Update scripts

This commit is contained in:
John Zhao
2018-03-08 17:30:47 +08:00
parent 5f1168368f
commit 1931fb96dd
4 changed files with 13 additions and 7 deletions

View File

@@ -9,7 +9,11 @@
# source "$(dirname "$0")/echo.sh"
# fi
ECHO="echo"
if [ "$OS" = "Windows_NT" ]; then
ECHO="echo -e"
else
ECHO="echo"
fi
# task colors
COLOR_STRONG="1;35" # Magenta

View File

@@ -32,7 +32,7 @@ if _host_contains_ "$_UNAME_S" "Linux"; then
HOST_OS="Linux"
elif _host_contains_ "$_UNAME_S" "Darwin"; then
HOST_OS="Mac"
elif [ -n "$Windows_NT" ]; then
elif _host_contains_ "$_UNAME_S" "MSYS\|MINGW"; then
HOST_OS="Win"
else
echo >&2 "-- HOST: unknown os :("

View File

@@ -1,13 +1,14 @@
#!/usr/bin/env sh
FIND="find"
if type where &> /dev/null; then
for i in `where find`; do
# find on MSYS instead of Windows
if [ `echo $i | grep -c "msys"` -gt 0 ]; then
echo "${i%.exe}" | tr -d "[:space:]" | sed -e 's/\\/\//g'
exit
FIND=`echo "${i%.exe}" | tr -d "[:space:]" | sed 's:\\\:/:g'`
fi
done
fi
echo "find"
echo "$FIND"