X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fgetdown%2Fbin%2Fjalview.sh;h=62da28c0b8058720fa1fc620c7f27d5d19ad62d6;hb=51909770452369f94b4a0070482ab0acdd96fada;hp=912f1adcd3dae7f996ad2fdc1c33bbe6fa239849;hpb=7f0a4109670acd7b68b4f1d38c99da4f1dde608e;p=jalview.git diff --git a/utils/getdown/bin/jalview.sh b/utils/getdown/bin/jalview.sh index 912f1ad..62da28c 100755 --- a/utils/getdown/bin/jalview.sh +++ b/utils/getdown/bin/jalview.sh @@ -80,7 +80,6 @@ fi if [ "${ISMACOS}" != 1 ]; then # older macos doesn't like uname -o, best to avoid if [ "$(uname -o)" = "Cygwin" ]; then # CYGWIN - echo "When using relative paths in args within Cygwin, please start with './' or '../'" >&2 CLASSPATH=$(cygpath -pw "${CLASSPATH}") # now for some arg paths fun. only translating paths starting with './', '../', '/' or '~' ARGS=() @@ -91,9 +90,8 @@ if [ "${ISMACOS}" != 1 ]; then # older macos doesn't like uname -o, best to avoi ARGS=( "${ARGS[@]}" "${ARG}" ) fi done - elif uname -r | grep Microsoft >/dev/null; then + elif uname -r | grep -i microsoft | grep -i wsl >/dev/null; then # WSL - echo "When using relative paths in args within WSL, please start with './' or '../'" >&2 CLASSPATH="" for JARPATH in "${JARPATHS[@]}"; do [ -n "${CLASSPATH}" ] && CLASSPATH="${CLASSPATH};"