git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3830 JAL-4160 Remove --noheadless as --gui does this. Simplifies wrapper scripts
[jalview.git]
/
utils
/
conda
/
jalview.sh
diff --git
a/utils/conda/jalview.sh
b/utils/conda/jalview.sh
index
c9ec026
..
995195f
100755
(executable)
--- a/
utils/conda/jalview.sh
+++ b/
utils/conda/jalview.sh
@@
-66,21
+66,19
@@
HEADLESS=0
GUI=0
HELP=0
DEBUG=0
GUI=0
HELP=0
DEBUG=0
-for ARG in "${@}"; do
+for RAWARG in "${@}"; do
+ ARG="${RAWARG%%=*}"
case "${ARG}" in
case "${ARG}" in
- "--headless")
+ --headless|--output|--image|--structureimage)
HEADLESS=1
;;
HEADLESS=1
;;
- "--help")
+ --help|--help-*|--version)
HELP=1
;;
HELP=1
;;
- --help-*)
- HELP=1
- ;;
- "--gui")
+ --gui)
GUI=1
;;
GUI=1
;;
- "--debug")
+ --debug)
DEBUG=1
;;
esac
DEBUG=1
;;
esac
@@
-174,7
+172,7
@@
fi
JVMARGS=( "${JVMARGS[@]}" "-DCONSOLEWIDTH=${COLUMNS}" )
if [ "${DEBUG}" = 1 ]; then
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
fi
-"${JAVA}" "${JVMARGS[@]}" -jar "${JARPATH}" jalview.bin.Launcher "${ARGS[@]}"
+"${JAVA}" "${JVMARGS[@]}" -jar "${JARPATH}" "${ARGS[@]}"