From 441aa8e6788246f9aaf328e460f3f6d9130c778c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laurent?= <francois.laurent@posteo.net>
Date: Fri, 14 Jun 2024 15:05:29 +0200
Subject: [PATCH] fix: -Jsysimage caused arguments to be shifted
---
scripts/larvatagger | 13 +++++++------
scripts/larvatagger.sh | 4 +++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/scripts/larvatagger b/scripts/larvatagger
index 91c4d7f..044eef8 100755
--- a/scripts/larvatagger
+++ b/scripts/larvatagger
@@ -9,17 +9,18 @@
currentdir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")
if [ "${1:0:2}" = "-J" ]; then
-cmd=$2
+args="$1 "
+shift
else
-cmd=$1
+args=
fi
+cmd=$1
case $cmd in
open)
shift
datapath=$1
shift
- args=
if [ -n "$BACKENDS_PATH" ]; then
args="--backends=\"$BACKENDS_PATH\" $args"
fi
@@ -35,14 +36,14 @@ train|predict)
shift
backend=$1
shift
- "$currentdir/larvatagger-toolkit.jl" $cmd "$BACKENDS_PATH/$backend" $@
+ "$currentdir/larvatagger-toolkit.jl" $cmd "$BACKENDS_PATH/$backend" $args$@
else
- "$currentdir/larvatagger-toolkit.jl" $@
+ "$currentdir/larvatagger-toolkit.jl" $args$@
fi
;;
import|merge|--version|-V)
- "$currentdir/larvatagger-toolkit.jl" $@
+ "$currentdir/larvatagger-toolkit.jl" $args$@
;;
*)
diff --git a/scripts/larvatagger.sh b/scripts/larvatagger.sh
index 3222537..a261c70 100755
--- a/scripts/larvatagger.sh
+++ b/scripts/larvatagger.sh
@@ -158,7 +158,9 @@ fi
RUN_ARGS="$RUN_ARGS --mount type=bind,src=\"$(realpath $instance)\",dst=/app/$backend/models/$(basename $instance)"
done
-eval "exec $docker run $RUN_ARGS -i ${DOCKER_ARGS}\"$LARVATAGGER_IMAGE\" open \"/data/$file\" $TAGGER_ARGS $@"
+DOCKER_RUN="exec $docker run $RUN_ARGS -i ${DOCKER_ARGS}\"$LARVATAGGER_IMAGE\" open \"/data/$file\" $TAGGER_ARGS $@"
+echo $DOCKER_RUN
+eval $DOCKER_RUN
;;
import | merge)
--
GitLab