Skip to content
Snippets Groups Projects
Commit fb6e90d1 authored by François  LAURENT's avatar François LAURENT
Browse files

OPEN_BROWSER env variable

parent 5fcec47c
No related branches found
No related tags found
1 merge request!18Set of commits to be tagged v0.18.3
Pipeline #131577 passed
...@@ -15,8 +15,8 @@ if [ "$1" = "--uninstall" ]; then ...@@ -15,8 +15,8 @@ if [ "$1" = "--uninstall" ]; then
if [ -d "$env" ]; then if [ -d "$env" ]; then
# clear the virtual environments # clear the virtual environments
env=$(dirname "$env") env=$(dirname "$env")
rm -rf "$env/maggotuba*" rm -rf "$env"/maggotuba*
rm -rf "$env/taggingbackends*" rm -rf "$env"/taggingbackends*
fi fi
fi fi
rm -rf "$BIN_DIR/larvatagger" rm -rf "$BIN_DIR/larvatagger"
...@@ -71,7 +71,7 @@ for arg in "$@"; do ...@@ -71,7 +71,7 @@ for arg in "$@"; do
done done
if [ -n "$WITH_DEFAULT_BACKEND" ]; then if [ -n "$WITH_DEFAULT_BACKEND" ]; then
if [ "`uname`" = "Darwin" ]; 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 fi
if ! command -v python3.8 1>/dev/null 2>&1; then if ! command -v python3.8 1>/dev/null 2>&1; then
if command -v pyenv 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 ...@@ -124,7 +124,7 @@ if [ -z "$WITH_DEFAULT_BACKEND" ]; then
cat <<EOF >$BIN_DIR/larvatagger cat <<EOF >$BIN_DIR/larvatagger
#!/usr/bin/env bash #!/usr/bin/env bash
"$LARVATAGGER_PATH/LarvaTagger.jl/scripts/larvatagger" \$@ OPEN_BROWSER=1 "$LARVATAGGER_PATH/LarvaTagger.jl/scripts/larvatagger" \$@
EOF EOF
else else
...@@ -171,7 +171,7 @@ fi ...@@ -171,7 +171,7 @@ fi
cat <<EOF >$BIN_DIR/larvatagger cat <<EOF >$BIN_DIR/larvatagger
#!/usr/bin/env bash #!/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 EOF
fi fi
......
...@@ -17,13 +17,16 @@ fi ...@@ -17,13 +17,16 @@ fi
case $cmd in case $cmd in
open) open)
shift shift
if [ -z "$BACKENDS_PATH" ]; then datapath=$1
"$currentdir/larvatagger-gui.jl" $@ shift
else args=
datapath=$1 if [ -n "$BACKENDS_PATH" ]; then
shift args="--backends=\"$BACKENDS_PATH\" $args"
"$currentdir/larvatagger-gui.jl" "$datapath" --backends="$BACKENDS_PATH" $@ fi
if [ -n "$OPEN_BROWSER" ]; then
args="--browser $args"
fi fi
eval "\"$currentdir/larvatagger-gui.jl\" \"$datapath\" $args$@"
;; ;;
train|predict) train|predict)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment