return outside function

should fix #48

bin/_gsh_pcm

@@ -3,11 +3,15 @@
 # pcm => "print current mission"
 GSH_CONFIG=$(cd "$(dirname "$0")/../.config"; pwd -P)
 
-PCM="$(awk '/^#/ {next}   $2=="START" {m=$1}  END {print (m)}' "$GSH_CONFIG/missions.log")"
-if [ -z "$PCM" ]
-then
-  echo "1"
-  return 1
-else
-  echo "$PCM"
-fi
+pcm() {
+  PCM="$(awk '/^#/ {next}   $2=="START" {m=$1}  END {print (m)}' "$GSH_CONFIG/missions.log")"
+  if [ -z "$PCM" ]
+  then
+    echo "1"
+    return 1
+  else
+    echo "$PCM"
+  fi
+}
+
+pcm "$@"

bin/_gsh_welcome

@@ -2,7 +2,10 @@
 
 . gettext.sh
 
-# display welcome message
-msg_file=$(eval_gettext '$GSH_ROOT/i18n/gameshell-welcome/en.txt')
-[ -r "$msg_file" ] || return 1
-parchment "$msg_file" | pager
+welcome() {
+  # display welcome message
+  msg_file=$(eval_gettext '$GSH_ROOT/i18n/gameshell-welcome/en.txt')
+  [ -r "$msg_file" ] || return 1
+  parchment "$msg_file" | pager
+}
+welcome "$@"

bin/copy_bin

@@ -1,14 +1,14 @@
 #!/bin/sh
 
-if [ -z "$MISSION_DIR" ]
-then
-  echo "Error: copy_bin \$MISSION_DIR undefined." >&2
-  return 1
-fi
-
 # create a script to call a mission executable with appropriate context:
 # correct TEXTDOMAIN (for translations) and MISSION_DIR (to use data files)
 copy_bin() {
+  if [ -z "$MISSION_DIR" ]
+  then
+    echo "Error: copy_bin \$MISSION_DIR undefined." >&2
+    return 1
+  fi
+
   if [ "$#" -ne 2 ]
   then
     echo "Error: copy_bin requires 2 arguments." >&2

bin/missionname

@@ -3,38 +3,41 @@
 GSH_ROOT=$(cd "$(dirname "$0")/.." && pwd -P)
 GSH_MISSIONS=$GSH_ROOT/missions
 
-path=$(realpath "$1")
-
-if ! [ -e "$path" ]
-then
-  echo "Error missionname: path doesn't exist ('$1')." >&2
-  return 1
-elif [ -f "$path" ]
-then
-  cd "$(dirname "$path")"
-else
-  cd "$path"
-fi
-
-while true
-do
-  [ -f check.sh ] && break
-  [ -f static.sh ] && break
-  [ -f init.sh ] && break
-  [ $(pwd -P) = "/" ] && break
-  cd ..
-done
-
-
-
-case "$PWD" in
-  "$GSH_MISSIONS/"*)
-    path=$(pwd -P)
-    echo "${path#$GSH_MISSIONS/}"
-    ;;
-  *)
-    echo "Error missionname: not a mission path ('$1')." >&2
-    return 1
-    ;;
-esac
+missionname() {
+  path=$(realpath "$1")
 
+  if ! [ -e "$path" ]
+  then
+    echo "Error missionname: path doesn't exist ('$1')." >&2
+    return 1
+  elif [ -f "$path" ]
+  then
+    cd "$(dirname "$path")"
+  else
+    cd "$path"
+  fi
+
+  while true
+  do
+    [ -f check.sh ] && break
+    [ -f static.sh ] && break
+    [ -f init.sh ] && break
+    [ $(pwd -P) = "/" ] && break
+    cd ..
+  done
+
+
+
+  case "$PWD" in
+    "$GSH_MISSIONS/"*)
+      path=$(pwd -P)
+      echo "${path#$GSH_MISSIONS/}"
+      ;;
+    *)
+      echo "Error missionname: not a mission path ('$1')." >&2
+      return 1
+      ;;
+  esac
+}
+
+missionname "$@"