From 2120f5f458a21c61d89965a650f8d272c5cdc02a Mon Sep 17 00:00:00 2001
From: Larry Masinter <LMM@acm.org>
Date: Sat, 16 Jul 2022 11:51:58 -0700
Subject: [PATCH 1/2] loadup and run-medley script bug fixes

---
 run-medley                       |  6 +++++-
 scripts/loadup-all.sh            | 13 ++++++++-----
 scripts/loadup-and-release.sh    |  1 -
 scripts/loadup-aux.sh            |  5 -----
 scripts/loadup-db.sh             |  5 -----
 scripts/loadup-full-from-lisp.sh |  5 -----
 scripts/loadup-full.sh           | 24 ++++--------------------
 scripts/loadup-init.sh           |  5 -----
 8 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/run-medley b/run-medley
index ef5c74e8..440e67e5 100755
--- a/run-medley
+++ b/run-medley
@@ -59,6 +59,10 @@ export LDEKBDTYPE=x
 while [ "$#" -ne 0 ]; do
     case "$1" in
 	"-loadup")
+	    # Keep (GREET) from finding adifferent init file
+	    mkdir -p $MEDLEYDIR/tmp/logindir
+	    export LOGINDIR=$MEDLEYDIR/tmp/logindir
+
 	    export MEDLEYLOADUP="$2"
 	    export LDEINIT="$2"
 	    shift
@@ -120,7 +124,7 @@ while [ "$#" -ne 0 ]; do
         "-lisp")
             export LDESRCESYSOUT="$MEDLEYDIR/loadups/lisp.sysout"
             ;;
-        "-N" | "-new" | "-newfull" )
+        "-n" | "-new" | "-newfull" )
             export LDESRCESYSOUT="$MEDLEYDIR/tmp/full.sysout"
             ;;
         "-nl" | "-newlisp" )
diff --git a/scripts/loadup-all.sh b/scripts/loadup-all.sh
index a40df57e..00373ab6 100755
--- a/scripts/loadup-all.sh
+++ b/scripts/loadup-all.sh
@@ -11,11 +11,14 @@ fi
     ./scripts/loadup-mid-from-init.sh && \
     ./scripts/loadup-lisp-from-mid.sh && \
     ./scripts/loadup-full-from-lisp.sh && \
-    ./scripts/loadup-aux.sh && \
-    ./scripts/copy-all.sh && \
-    ls -l loadups/*.sysout loadups/whereis.hash library/exports.all && \
-    echo "**** DONE ****"
-    
+    ./scripts/loadup-aux.sh
+
+echo "loadups are in $MEDLEYDIR/tmp"
+edho use
+echo "   ./scripts/copy-all.sh   "
+echo "to copy to loadups library"
+echo "**** DONE ****"
+
 
 
 
diff --git a/scripts/loadup-and-release.sh b/scripts/loadup-and-release.sh
index ed2d030f..cee4e2ac 100755
--- a/scripts/loadup-and-release.sh
+++ b/scripts/loadup-and-release.sh
@@ -8,6 +8,5 @@ if [ ! -x run-medley ] ; then
 fi
 
 ./scripts/loadup-all.sh  &&  \
-    ./scripts/copy-all.sh && \
     ./scripts/release-medley.sh
 
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index ef0ebbec..a71dfaae 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -9,11 +9,6 @@ fi
 
 touch tmp/loadup.timestamp
 
-# Keep (GREET) from finding an init file
-mkdir -p $MEDLEYDIR/tmp/logindir
-export HOME=$MEDLEYDIR/tmp/logindir
-export LOGINDIR=$MEDLEYDIR/tmp/logindir
-
 scr="-sc 1024x768 -g 1042x790"
 
 echo '" (IL:MEDLEY-INIT-VARS)(IL:LOAD(QUOTE MEDLEY-UTILS))(IL:MAKE-EXPORTS-ALL)(IL:MAKE-WHEREIS-HASH)(IL:LOGOUT T)"' > tmp/loadup-aux.cm
diff --git a/scripts/loadup-db.sh b/scripts/loadup-db.sh
index e5c6de8d..8c764b41 100755
--- a/scripts/loadup-db.sh
+++ b/scripts/loadup-db.sh
@@ -9,11 +9,6 @@ fi
 
 touch tmp/loadup.timestamp
 
-# Keep (GREET) from finding an init file
-mkdir -p $MEDLEYDIR/tmp/logindir
-export HOME=$MEDLEYDIR/tmp/logindir
-export LOGINDIR=$MEDLEYDIR/tmp/logindir
-
 scr="-sc 1024x768 -g 1042x790"
 
 echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > tmp/loadup-db.cm
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index bf0b80a6..14277016 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -10,11 +10,6 @@ scr="-sc 1024x768 -g 1042x790"
 
 touch tmp/loadup.timestamp
 
-# Keep (GREET) from finding an init file
-mkdir -p $MEDLEYDIR/tmp/logindir
-export HOME=$MEDLEYDIR/tmp/logindir
-export LOGINDIR=$MEDLEYDIR/tmp/logindir
-
 ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/tmp/lisp.sysout"
 
 if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then
diff --git a/scripts/loadup-full.sh b/scripts/loadup-full.sh
index 6e488d43..a3a06fe1 100755
--- a/scripts/loadup-full.sh
+++ b/scripts/loadup-full.sh
@@ -7,25 +7,9 @@ if [ ! -x run-medley ] ; then
     exit 1 ;
 fi
 
-# Keep (GREET) from finding an init file
-mkdir -p $MEDLEYDIR/tmp/logindir
-export HOME=$MEDLEYDIR/tmp/logindir
-export LOGINDIR=$MEDLEYDIR/tmp/logindir
 
-scr="-sc 1024x768 -g 1042x790"
+    ./scripts/loadup-init.sh && \
+    ./scripts/loadup-mid-from-init.sh && \
+    ./scripts/loadup-lisp-from-mid.sh && \
+    ./scripts/loadup-full-from-lisp.sh
 
-touch tmp/loadup.timestamp
-
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/loadups/lisp.sysout"
-
-if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/full.*
-    echo --------------
-
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/full.*
-    exit 1
-fi
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index 4a864050..85c387c0 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -9,11 +9,6 @@ fi
 
 scr="-sc 1024x768 -g 1042x790"
 
-# Keep (GREET) from finding an init file
-mkdir -p $MEDLEYDIR/tmp/logindir
-export HOME=$MEDLEYDIR/tmp/logindir
-export LOGINDIR=$MEDLEYDIR/tmp/logindir
-
 touch tmp/loadup.timestamp
 
 ./run-medley $scr -loadup "$MEDLEYDIR"/sources/LOADUP-INIT.LISP loadups/starter.sysout

From 2728839bc70a04e26edeb0e1caeac88ae4d7a852 Mon Sep 17 00:00:00 2001
From: Larry Masinter <LMM@acm.org>
Date: Sat, 16 Jul 2022 16:04:33 -0700
Subject: [PATCH 2/2] fix typo

---
 scripts/loadup-all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/loadup-all.sh b/scripts/loadup-all.sh
index 00373ab6..98c99db5 100755
--- a/scripts/loadup-all.sh
+++ b/scripts/loadup-all.sh
@@ -14,7 +14,7 @@ fi
     ./scripts/loadup-aux.sh
 
 echo "loadups are in $MEDLEYDIR/tmp"
-edho use
+echo use
 echo "   ./scripts/copy-all.sh   "
 echo "to copy to loadups library"
 echo "**** DONE ****"