diff --git a/scripts/install.sh b/scripts/install.sh index b4d96e3cea3757ee8e3f1da0ae311f843a61c7ce..d6d304466124a1fdf9a9c668db866b7810d2fa4b 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -15,8 +15,8 @@ if [ "$1" = "--uninstall" ]; then if [ -d "$env" ]; then # clear the virtual environments env=$(dirname "$env") - rm -rf "$env/maggotuba*" - rm -rf "$env/taggingbackends*" + rm -rf "$env"/maggotuba* + rm -rf "$env"/taggingbackends* fi fi rm -rf "$BIN_DIR/larvatagger" @@ -71,7 +71,7 @@ for arg in "$@"; do done if [ -n "$WITH_DEFAULT_BACKEND" ]; then if [ "`uname`" = "Darwin" ]; then - echo "WARNING: the default tagging backend does not work on macOS" + echo "WARNING: the default tagging backend is not supported by macOS" fi if ! command -v python3.8 1>/dev/null 2>&1; then if command -v pyenv 1>/dev/null 2>&1; then @@ -124,7 +124,7 @@ if [ -z "$WITH_DEFAULT_BACKEND" ]; then cat <<EOF >$BIN_DIR/larvatagger #!/usr/bin/env bash -"$LARVATAGGER_PATH/LarvaTagger.jl/scripts/larvatagger" \$@ +OPEN_BROWSER=1 "$LARVATAGGER_PATH/LarvaTagger.jl/scripts/larvatagger" \$@ EOF else @@ -171,7 +171,7 @@ fi cat <<EOF >$BIN_DIR/larvatagger #!/usr/bin/env bash -JULIA_PROJECT="$(realpath "$LARVATAGGER_PATH/TaggingBackends")" BACKENDS_PATH="$LARVATAGGER_PATH" "$LARVATAGGER_PATH/LarvaTagger.jl/scripts/larvatagger" \$@ +JULIA_PROJECT="$(realpath "$LARVATAGGER_PATH/TaggingBackends")" BACKENDS_PATH="$LARVATAGGER_PATH" OPEN_BROWSER=1 "$LARVATAGGER_PATH/LarvaTagger.jl/scripts/larvatagger" \$@ EOF fi diff --git a/scripts/larvatagger b/scripts/larvatagger index 213f82515917dcafb64cb37676a2bffb7d4f7caa..91c4d7f2df592049367abc46c40ab0d0de2ebf72 100755 --- a/scripts/larvatagger +++ b/scripts/larvatagger @@ -17,13 +17,16 @@ fi case $cmd in open) shift - if [ -z "$BACKENDS_PATH" ]; then - "$currentdir/larvatagger-gui.jl" $@ - else - datapath=$1 - shift - "$currentdir/larvatagger-gui.jl" "$datapath" --backends="$BACKENDS_PATH" $@ + datapath=$1 + shift + args= + if [ -n "$BACKENDS_PATH" ]; then + args="--backends=\"$BACKENDS_PATH\" $args" + fi + if [ -n "$OPEN_BROWSER" ]; then + args="--browser $args" fi + eval "\"$currentdir/larvatagger-gui.jl\" \"$datapath\" $args$@" ;; train|predict)