X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fconda%2Fjalview.sh;h=995195f5b6d0f82a9e51de6daa94642d37acaccb;hb=3778008766299b5db71d77e8530a9c0fe9b6916d;hp=c9ec026dba30f0ff559ae720e3ef0b5104e9eac6;hpb=e63e442ec4eea069cb7caa4ebe0c7e6f04855c74;p=jalview.git

diff --git a/utils/conda/jalview.sh b/utils/conda/jalview.sh
index c9ec026..995195f 100755
--- a/utils/conda/jalview.sh
+++ b/utils/conda/jalview.sh
@@ -66,21 +66,19 @@ HEADLESS=0
 GUI=0
 HELP=0
 DEBUG=0
-for ARG in "${@}"; do
+for RAWARG in "${@}"; do
+  ARG="${RAWARG%%=*}"
   case "${ARG}" in
-    "--headless")
+    --headless|--output|--image|--structureimage)
       HEADLESS=1
       ;;
-    "--help")
+    --help|--help-*|--version)
       HELP=1
       ;;
-    --help-*)
-      HELP=1
-      ;;
-    "--gui")
+    --gui)
       GUI=1
       ;;
-    "--debug")
+    --debug)
       DEBUG=1
       ;;
   esac
@@ -174,7 +172,7 @@ fi
 JVMARGS=( "${JVMARGS[@]}" "-DCONSOLEWIDTH=${COLUMNS}" )
 
 if [ "${DEBUG}" = 1 ]; then
- echo Shell running: "${JAVA}" "${JVMARGS[@]}" -jar \""${JARPATH}"\" jalview.bin.Launcher "${ARGS[@]}"
+ echo Shell running: "${JAVA}" "${JVMARGS[@]}" -jar \""${JARPATH}"\" "${ARGS[@]}"
 fi
 
-"${JAVA}" "${JVMARGS[@]}" -jar "${JARPATH}" jalview.bin.Launcher "${ARGS[@]}"
+"${JAVA}" "${JVMARGS[@]}" -jar "${JARPATH}" "${ARGS[@]}"