2 directory names / script names differed only in case

which is a problem on case insensitive filesystems...
phyver · Aug 13, 2024 · 82bd704 · 82bd704
1 parent 746f72e
commit 82bd704
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 19 deletions.
diff --git 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
@@ -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 → i18n/gameshell-full-help/en.txt b/i18n/gameshell-HELP/en.txt → i18n/gameshell-full-help/en.txt
diff --git a/i18n/gameshell-HELP/fr.txt → i18n/gameshell-full-help/fr.txt b/i18n/gameshell-HELP/fr.txt → i18n/gameshell-full-help/fr.txt
diff --git a/i18n/gameshell-HELP/it.txt → i18n/gameshell-full-help/it.txt b/i18n/gameshell-HELP/it.txt → i18n/gameshell-full-help/it.txt
diff --git 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
@@ -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
@@ -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
diff --git a/scripts/_gsh_help b/scripts/_gsh_help