display prompt in pager

bin/_gsh_index

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. gettext.sh
-
 n=1
 while read -r mission_dir
 do

bin/pager

@@ -1,8 +1,17 @@
 #!/bin/sh
 
-if command -v less > /dev/null 2>&1
+TEXTDOMAIN=gsh
+
+
+if [ -n "$PAGER" ]
+then
+  $PAGER "$@"
+elif command -v less > /dev/null 2>&1
 then
-  less -rEX "$@"
+  LESS= less -rEX -Ps"$(gettext '[Press space to continue, 'q' to quit\.]')$" \
+             -Pm"$(gettext '[Press space to continue, 'q' to quit\.]')$" \
+             -PM"$(gettext '[Press space to continue, 'q' to quit\.]')$" \
+             "$@"
 else
   more "$@"
 fi

bin/progress_bar

@@ -2,8 +2,6 @@
 
 # display a small animation until the given PID stops
 
-. gettext.sh
-
 TEXTDOMAIN=gsh
 
 get_design() {

i18n/en.po

@@ -235,6 +235,9 @@ msgstr  "While you are waiting, you see a fish swimming in circles..."
 msgid   "Y"
 msgstr  "Y"
 
+msgid   "[Press space to continue, q to quit\\.]"
+msgstr  "[Press space to continue, q to quit\\.]"
+
 msgid   "cancelled"
 msgstr  "cancelled"
 

i18n/fr.po

@@ -234,6 +234,9 @@ msgstr  "Pendant que vous attendez, un poisson fait des ronds..."
 msgid   "Y"
 msgstr  "O"
 
+msgid   "[Press space to continue, q to quit\\.]"
+msgstr  "[Appuyer sur la barre d'espace pour continuer, 'q' pour quitter\\.]"
+
 msgid   "cancelled"
 msgstr  "annulée"
 

i18n/template.pot

@@ -221,6 +221,9 @@ msgstr  ""
 msgid   "Y"
 msgstr  ""
 
+msgid   "[Press space to continue, q to quit\\.]"
+msgstr  ""
+
 msgid   "cancelled"
 msgstr  ""
 

lib/gshrc

@@ -29,6 +29,16 @@ export PS2="> "
 export PS3=""
 export PS4="+ "
 
+# choose appropriate pager
+unset PAGER
+tempfile=$(mktemp)
+echo "TEST" | "$GSH_ROOT/bin/pager" 2>"$tempfile" >/dev/null
+if [ -s "$tempfile" ]
+then
+  export PAGER=more
+fi
+rm -f "$mktemp"
+
 # try to prevent using sudo and similar
 su() {
     echo "gsh: su: command not found" >&2