make it possible to choose several index files

I also change the way make_index works:
  - if used from a self extracting archive, prefix all arguments with
    $GSH_MISSIONS/
  - otherwise, use the actual files given from the command line

I also print a warning when giving index files in "continue" mode, as
those are not used.

Author: phyver

i18n/en.po

@@ -207,6 +207,14 @@ msgstr  "There are stopped jobs in your session.\n"
         "    $ jobs\n"
         "Do you still want to quit? [y/n]"
 
+#, sh-format
+msgid   "Warning: command line arguments are ignored when continuing a game ($args)"
+msgstr  "Warning: command line arguments are ignored when continuing a game ($args)"
+
+#, sh-format
+msgid   "Warning: language is ignored when continuing a game ($args)"
+msgstr  "Warning: language is ignored when continuing a game ($args)"
+
 msgid   "Warning: the file 'treasure.sh' was sourced from a subshell.\n"
         "You should use the command\n"
         "  $ gsh reset"

i18n/fr.po

@@ -212,6 +212,14 @@ msgstr  "Il y a des processus stoppés dans votre session.\n"
         "    $ jobs\n"
         "Êtes vous sûr de vouloir quitter ? [o/N]"
 
+#, sh-format
+msgid   "Warning: command line arguments are ignored when continuing a game ($args)"
+msgstr  "Warning: les arguments sur la ligne de commande sont ignorés lorsqu'on reprend une partie ($args)"
+
+#, sh-format
+msgid   "Warning: language is ignored when continuing a game ($args)"
+msgstr  "Warning: la langue est ignorée lorsqu'on reprend une partie ($args)"
+
 msgid   "Warning: the file 'treasure.sh' was sourced from a subshell.\n"
         "You should use the command\n"
         "  $ gsh reset"

i18n/it.po

@@ -222,6 +222,14 @@ msgstr  "Ci sono dei processi fermati nella tua sessione.\n"
         "Vuoi uscire lo stesso? [s/n\n"
         "]"
 
+#, sh-format
+msgid   "Warning: command line arguments are ignored when continuing a game ($args)"
+msgstr  ""
+
+#, sh-format
+msgid   "Warning: language is ignored when continuing a game ($args)"
+msgstr  ""
+
 msgid   "Warning: the file 'treasure.sh' was sourced from a subshell.\n"
         "You should use the command\n"
         "  $ gsh reset"

i18n/template.pot

@@ -197,6 +197,14 @@ msgid   "There are stopped jobs in your session.\n"
         "Do you still want to quit? [y/n]"
 msgstr  ""
 
+#, sh-format
+msgid   "Warning: command line arguments are ignored when continuing a game ($args)"
+msgstr  ""
+
+#, sh-format
+msgid   "Warning: language is ignored when continuing a game ($args)"
+msgstr  ""
+
 msgid   "Warning: the file 'treasure.sh' was sourced from a subshell.\n"
         "You should use the command\n"
         "  $ gsh reset"

scripts/make_index

@@ -115,19 +115,17 @@ make_index() {
     return 0
   fi
 
-  if [ "$#" -eq 1 ] && [ -f "$GSH_MISSIONS/$1" ]
+  # when used from a self extracting archive, all path are prefixed with the
+  # mission directory
+  if [ -n "$GSH_EXEC_FILE" ]
   then
-    # with a single file argument, we assume it is an index file
-    parse_index "$GSH_MISSIONS/$1" || exit 1
-    return 0
+    PREFIX="$GSH_MISSIONS/"
   fi
 
   # otherwise, parse each mission / index file from the arguments
-  # (Note, it should not be used from a GameShell instance, but only directly
-  # from ``start.sh`` or from ``utils/archive.sh``
   while [ "$#" -gt 0 ]
   do
-    MISSION_DIR=$(readlink-f "$1")
+    MISSION_DIR=$(readlink-f "$PREFIX$1")
     if [ -e "$MISSION_DIR" ]
     then
       parse_mission "$MISSION_DIR" || exit 1

start.sh

@@ -38,7 +38,7 @@ display_help() {
 
 
 # list of index files (default: only index.txt)
-export GSH_INDEX_FILES=index.txt  # DO NOT CHANGE OR REMOVE THIS LINE, it is used by utils/archive.sh
+export GSH_INDEX_FILES=index.txt
 
 # possible values: index, simple (default), overwrite
 export GSH_SAVEFILE_MODE="simple"
@@ -102,6 +102,13 @@ do
       ;;
     L)
       export LANGUAGE="$OPTARG"     # only works on GNU systems
+      if [ "$RESET" = FALSE ]
+      then
+        args="-L $OPTARG"
+        echo "$(eval_gettext 'Warning: language is ignored when continuing a game ($args)')" >&2
+        echo "$(gettext 'Press Enter to continue.')" >&2
+        read -r _
+      fi
       ;;
     G)
       export GSH_NO_GETTEXT=1
@@ -249,18 +256,40 @@ init_gsh() {
   #    - continue the previous game
   if [ -e "$GSH_CONFIG" ]
   then
-    if [ -z "$RESET" ]
-    then
+
+    while [ -z "$RESET" ]
+    do
       local r
       printf "$(eval_gettext 'The directory $GSH_CONFIG contains meta-data from a previous game.
 Do you want to remove it and start a new game? [y/N]') "
       read -r r
-      [ "$r" = "$(gettext "y")" ] || [ "$r" = "$(gettext "Y")" ] || return 1
+      if [ "$r" = "$(gettext "y")" ] || [ "$r" = "$(gettext "Y")" ]
+      then
+        RESET=TRUE
+        echo
+      fi
+      if [ -z "$r" ] || [ "$r" = "$(gettext "n")" ] || [ "$r" = "$(gettext "N")" ]
+      then
+        RESET=FALSE
+        echo
+      fi
+    done
 
-    elif [ "$RESET" = "FALSE" ]
+  else
+    # if no data is found, we need to initialize a new game
+    RESET=TRUE
+  fi
+
+  if [ "$RESET" = FALSE ]
+  then
+    if [ "$#" -gt 0 ]
     then
-      return 1
+      args=$*
+      echo "$(eval_gettext 'Warning: command line arguments are ignored when continuing a game ($args)')" >&2
+      echo "$(gettext 'Press Enter to continue.')" >&2
+      read -r _
     fi
+    return 1
   fi
 
   ### if we're here, we need to reset a new game