renaming of files and dirs to be more consistent

GSH_ROOT/bin => GSH_ROOT/scripts

previous_commands.sh => fc-lnr.sh

history_start.sh / history_clean.sh => alt_history_start.sh / alt_history_stop.sh

realpath => readlink-f

save_environment.sh => print_current_environment.sh

Author: phyver

Makefile

@@ -60,7 +60,7 @@ tests-verbose: clean
 	./"game shell (1).sh" -RDq -c 'gsh systemconfig; for _ in $$(seq 42); do gsh goal|cat; gsh test --abort; gsh auto --abort; done; gsh stat'
 
 clean:
-	rm -rf i18n/*~ locale gameshell.tgz gameshell.sh gameshell-save.sh bin/boxes-data.awk
+	rm -rf i18n/*~ locale gameshell.tgz gameshell.sh gameshell-save.sh scripts/boxes-data.awk
 	rm -rf .bin .config .sbin .var World
 	rm -rf "game shell"*
 

lib/bin_test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-### test the various utilities in GSH_ROOT/bin/ directory
+### test the various utilities in GSH_ROOT/scripts/ directory
 
 test_mktemp() (
   if ! tmp=$(mktemp 2>/dev/null)
@@ -17,33 +17,33 @@ test_mktemp() (
 )
 
 
-test_realpath() (
+test_readlink_f() (
   tmp=${GSH_TMP:?Error: \$GSH_TMP not set}
   cd "$tmp"
   rm -f a b
 
   touch a
-  rpa=$(realpath ./a)
+  rpa=$(readlink-f ./a)
   if [ -z "$rpa" ]
   then
-    echo "Error: realpath returned the empty string." >&2
+    echo "Error: readlink-f returned the empty string." >&2
     return 1
   fi
 
   case "$rpa" in
-    "$(realpath "$tmp")"* )
+    "$(readlink-f "$tmp")"* )
       ;;
     * )
-    echo "Error: realpath didn't give an absolute path." >&2
+    echo "Error: readlink-f didn't give an absolute path." >&2
     return 1
     ;;
   esac
 
   ln -s a b
-  rpb=$(realpath b)
+  rpb=$(readlink-f b)
   if [ "$rpa" != "$rpb" ]
   then
-    echo "Error: realpath doesn't resolve symbolic links." >&2
+    echo "Error: readlink-f doesn't resolve symbolic links." >&2
     return 1
   fi
 
@@ -97,4 +97,4 @@ test_sign() (
   return 0
 )
 
-test_mktemp && test_realpath && test_checksum && test_sign
+test_mktemp && test_readlink_f && test_checksum && test_sign

lib/gsh.sh

@@ -194,7 +194,7 @@ __gsh_start() {
     then
       local env_before=$(mktemp)
       local env_after=$(mktemp)
-      . save_environment.sh > "$env_before"
+      . print_current_environment.sh > "$env_before"
     fi
 
     mission_source "$MISSION_DIR/init.sh"
@@ -221,7 +221,7 @@ Aborting.")" >&2
 
     if ! . mainshell.sh
     then
-      . save_environment.sh > "$env_after"
+      . print_current_environment.sh > "$env_after"
 
       if ! cmp -s "$env_before" "$env_after"
       then

lib/gshrc

@@ -23,7 +23,7 @@ export COLUMNS
 # choose appropriate pager
 unset PAGER
 tempfile=$(mktemp)
-echo "TEST" | "$GSH_ROOT/bin/pager" 2>"$tempfile" >/dev/null
+echo "TEST" | "$GSH_ROOT/scripts/pager" 2>"$tempfile" >/dev/null
 if [ -s "$tempfile" ]
 then
   export PAGER=more

lib/mission_source.sh

@@ -44,7 +44,7 @@ mission_source() {
     local _MISSION_DIR _TEXTDOMAIN _MISSION_NAME _PATH exit_status
     export MISSION_DIR TEXTDOMAIN MISSION_NAME
     _MISSION_DIR=$MISSION_DIR
-    MISSION_DIR=$(dirname "$(realpath "$FILENAME")")
+    MISSION_DIR=$(dirname "$(readlink-f "$FILENAME")")
     _TEXTDOMAIN=$TEXTDOMAIN
     TEXTDOMAIN=$(textdomainname "$MISSION_DIR")
     _MISSION_NAME=$MISSION_NAME
@@ -75,9 +75,9 @@ mission_source() {
 
   # otherwise, record the environment (variables, functions and aliases)
   # before and after to echo a message when there are differences
-  . save_environment.sh >"$env_before"
+  . print_current_environment.sh >"$env_before"
   _MISSION_DIR=$MISSION_DIR
-  MISSION_DIR=$(dirname "$(realpath "$FILENAME")")
+  MISSION_DIR=$(dirname "$(readlink-f "$FILENAME")")
   _TEXTDOMAIN=$TEXTDOMAIN
   TEXTDOMAIN=$(textdomainname "$MISSION_DIR")
   _MISSION_NAME=$MISSION_NAME
@@ -90,7 +90,7 @@ mission_source() {
   MISSION_NAME=$_MISSION_NAME
   MISSION_DIR=$_MISSION_DIR
   PATH=$_PATH
-  . save_environment.sh | grep -v "$MISSION_FN" > "$env_after"
+  . print_current_environment.sh | grep -v "$MISSION_FN" > "$env_after"
 
   if ! cmp -s "$env_before" "$env_after"
   then

lib/profile.sh

@@ -30,6 +30,6 @@ export COLUMNS
 # putting $GSH_ROOT/bin first makes sure the local scripts are prefered over
 # system commands (realpath, seq, etc.). This is useful for testing, but
 # probably shouldn't be done for "stable" releases.
-PATH="$GSH_ROOT/bin":$PATH
-# PATH=$PATH:"$GSH_ROOT/bin"
+PATH="$GSH_ROOT/scripts":$PATH
+# PATH=$PATH:"$GSH_ROOT/scripts"
 

missions/basic/01_cd_tower/check.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-goal=$(realpath "$(eval_gettext "\$GSH_HOME/Castle/Main_tower/First_floor/Second_floor/Top_of_the_tower")")
-current=$(realpath "$PWD")
+goal=$(readlink-f "$(eval_gettext "\$GSH_HOME/Castle/Main_tower/First_floor/Second_floor/Top_of_the_tower")")
+current=$(readlink-f "$PWD")
 
 if [ "$goal" = "$current" ]
 then

missions/basic/02_cd.._cellar/check.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-goal=$(realpath "$(eval_gettext "\$GSH_HOME/Castle/Cellar")")
-current=$(realpath "$PWD")
+goal=$(readlink-f "$(eval_gettext "\$GSH_HOME/Castle/Cellar")")
+current=$(readlink-f "$PWD")
 
 if [ "$goal" = "$current" ]
 then

missions/basic/03_cd_HOME_throne/auto.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. history_start.sh
+. alt_history_start.sh
 
 cd "$(eval_gettext '$GSH_HOME/Castle/Main_building/Throne_room')"
 
@@ -11,4 +11,4 @@ add_cmd cd "$(eval_gettext '$GSH_HOME/Castle/Main_building/Throne_room')"
 add_cmd gsh check
 gsh check
 
-. history_clean.sh
+. alt_history_stop.sh

missions/basic/03_cd_HOME_throne/check.sh

@@ -3,10 +3,10 @@
 # this should be POSIX compliant, but debian's sh (dash) doesn't have fc!
 
 _mission_check() {
-  goal=$(realpath "$(eval_gettext "\$GSH_HOME/Castle/Main_building/Throne_room")")
-  current=$(realpath "$PWD")
+  goal=$(readlink-f "$(eval_gettext "\$GSH_HOME/Castle/Main_building/Throne_room")")
+  current=$(readlink-f "$PWD")
 
-  ppc=$(. previous_commands.sh | sed -n '2p;3q')
+  ppc=$(. fc-lnr.sh | sed -n '2p;3q')
 
   # FIXME: also accept other commands to go back to the starting point?
   # FIXME: add an error message