From 36e8aeb0b005ccd375f21ed5474d371a9dfce2bd Mon Sep 17 00:00:00 2001 From: Pierre Hyvernat Date: Thu, 25 Aug 2022 23:32:27 +0200 Subject: [PATCH] using option -E for archive.sh defines GSH_NO_GETTEXT as well --- scripts/_gsh_env | 1 + utils/archive.sh | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/scripts/_gsh_env b/scripts/_gsh_env index d60c956a..4720f316 100755 --- a/scripts/_gsh_env +++ b/scripts/_gsh_env @@ -11,6 +11,7 @@ echo " GSH_SAVEFILE_MODE=$GSH_SAVEFILE_MODE" echo " GSH_SAVEFILE=$GSH_SAVEFILE" echo " GSH_COLOR=$GSH_COLOR" echo " GSH_SHELL=$GSH_SHELL" +echo " GSH_NO_GETTEXT=$GSH_NO_GETTEXT" echo "=========================" echo " GSH_ROOT=$GSH_ROOT" echo " GSH_HOME=$GSH_HOME" diff --git a/utils/archive.sh b/utils/archive.sh index a4962ae7..775c7baa 100755 --- a/utils/archive.sh +++ b/utils/archive.sh @@ -16,6 +16,7 @@ options: -A use the "anonymous mode" by default when running GameShell -L LANGS only keep the given languages (ex: -L 'en*,fr') -E only keep english as a language, not generating any ".mo" file + and not using gettext -N ... name of the archive / top directory (default: "gameshell") @@ -88,6 +89,7 @@ do LANGUAGES= KEEP_PO=0 GENERATE_MO=0 + GSH_NO_GETTEXT=1 ;; v) VERBOSE=1 @@ -188,6 +190,12 @@ export GSH_ROOT="$TMP_DIR/$NAME" export GSH_MISSIONS="$GSH_ROOT/missions" +# default GSH_NO_GETTEXT to 1 if -E was used +if [ -n "$GSH_NO_GETTEXT" ] +then + sed-i "s/^# export GSH_NO_GETTEXT=./export GSH_NO_GETTEXT=1/" "$GSH_ROOT/start.sh" +fi + # remove unwanted languages if [ -n "$LANGUAGES" ] then