From fb6e90d1623bcfa75dac856df33830f3a0bc62b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laurent?= <francois.laurent@posteo.net>
Date: Tue, 28 May 2024 20:59:00 +0200
Subject: [PATCH] OPEN_BROWSER env variable
---
scripts/install.sh | 10 +++++-----
scripts/larvatagger | 15 +++++++++------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/scripts/install.sh b/scripts/install.sh
index b4d96e3..d6d3044 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 213f825..91c4d7f 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)
--
GitLab