diff --git a/i18n/en.po b/i18n/en.po index 32486a1b..5a673fcb 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED -- DO NOT EDIT #, sh-format -msgid "$GSH_ROOT/i18n/gameshell-HELP/en.txt" -msgstr "$GSH_ROOT/i18n/gameshell-HELP/en.txt" +msgid "$GSH_ROOT/i18n/gameshell-full-help/en.txt" +msgstr "$GSH_ROOT/i18n/gameshell-full-help/en.txt" #, sh-format msgid "$GSH_ROOT/i18n/gameshell-help/en.txt" diff --git a/i18n/fr.po b/i18n/fr.po index 9242ac71..1f36739c 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=UTF-8\n" "Plural-Forms: nplurals=2; plural=n>1;\n" #, sh-format -msgid "$GSH_ROOT/i18n/gameshell-HELP/en.txt" -msgstr "$GSH_ROOT/i18n/gameshell-HELP/fr.txt" +msgid "$GSH_ROOT/i18n/gameshell-full-help/en.txt" +msgstr "$GSH_ROOT/i18n/gameshell-full-help/fr.txt" #, sh-format msgid "$GSH_ROOT/i18n/gameshell-help/en.txt" diff --git a/i18n/gameshell-HELP/en.txt b/i18n/gameshell-full-help/en.txt similarity index 100% rename from i18n/gameshell-HELP/en.txt rename to i18n/gameshell-full-help/en.txt diff --git a/i18n/gameshell-HELP/fr.txt b/i18n/gameshell-full-help/fr.txt similarity index 100% rename from i18n/gameshell-HELP/fr.txt rename to i18n/gameshell-full-help/fr.txt diff --git a/i18n/gameshell-HELP/it.txt b/i18n/gameshell-full-help/it.txt similarity index 100% rename from i18n/gameshell-HELP/it.txt rename to i18n/gameshell-full-help/it.txt diff --git a/i18n/it.po b/i18n/it.po index 548a4ae5..aed99ffd 100644 --- a/i18n/it.po +++ b/i18n/it.po @@ -14,8 +14,8 @@ msgstr "Project-Id-Version: \n" "X-Generator: Lokalize 22.04.1\n" #, sh-format -msgid "$GSH_ROOT/i18n/gameshell-HELP/en.txt" -msgstr "$GSH_ROOT/i18n/gameshell-HELP/it.txt" +msgid "$GSH_ROOT/i18n/gameshell-full-help/en.txt" +msgstr "$GSH_ROOT/i18n/gameshell-full-help/it.txt" #, sh-format msgid "$GSH_ROOT/i18n/gameshell-help/en.txt" diff --git a/i18n/template.pot b/i18n/template.pot index dd66df7b..0c0c03fc 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -1,5 +1,5 @@ #, sh-format -msgid "$GSH_ROOT/i18n/gameshell-HELP/en.txt" +msgid "$GSH_ROOT/i18n/gameshell-full-help/en.txt" msgstr "" #, sh-format diff --git a/lib/gsh.sh b/lib/gsh.sh index edc52a4e..69bd86fb 100644 --- a/lib/gsh.sh +++ b/lib/gsh.sh @@ -639,6 +639,17 @@ _gsh_test() { } +### +# don't put the next 2 functions in $GSH_ROOT/scripts/_gsh_help / _gsh_HELP +# because it doesn't work on case insensitive filesystems +_gsh_help() { + parchment "$(eval_gettext '$GSH_ROOT/i18n/gameshell-help/en.txt')" Parchment2 | pager +} + +_gsh_HELP() { + parchment "$(eval_gettext '$GSH_ROOT/i18n/gameshell-full-help/en.txt')" Parchment2 | pager +} + gsh() { local _TEXTDOMAIN=$TEXTDOMAIN export TEXTDOMAIN="gsh" @@ -708,6 +719,14 @@ gsh() { __gsh_start "$@" ;; + "help") + _gsh_help + ;; + + "HELP") + _gsh_HELP + ;; + *) if command -v "_gsh_$cmd" >/dev/null then diff --git a/scripts/_gsh_HELP b/scripts/_gsh_HELP deleted file mode 100755 index 638672b5..00000000 --- a/scripts/_gsh_HELP +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh - -. gsh_gettext.sh - -parchment "$(eval_gettext '$GSH_ROOT/i18n/gameshell-HELP/en.txt')" Parchment2 | pager - diff --git a/scripts/_gsh_help b/scripts/_gsh_help deleted file mode 100755 index d2ec695a..00000000 --- a/scripts/_gsh_help +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh - -. gsh_gettext.sh - -parchment "$(eval_gettext '$GSH_ROOT/i18n/gameshell-help/en.txt')" Parchment2 | pager -