From b59e37b7030b4e9cdfd04a7fadda20b6735b8aa9 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 31 Jul 2023 00:42:23 -0700
Subject: [PATCH 01/28] Remake loadup scripts to not use MEDLEYDIR/tmp as a
 working dir AND cleanly separate loadup-all from loadup-db; adjust
 buildLoadup.yml accordingly

---
 .github/workflows/buildLoadup.yml |   1 +
 scripts/copy-all.sh               |  28 ++++++-------
 scripts/loadup-all.sh             |  12 ++++--
 scripts/loadup-apps-from-full.sh  |  61 ++++------------------------
 scripts/loadup-aux.sh             |  22 ++--------
 scripts/loadup-db.sh              |  28 ++++++-------
 scripts/loadup-full-from-lisp.sh  |  18 ++-------
 scripts/loadup-init.sh            |  20 ++--------
 scripts/loadup-lisp-from-mid.sh   |  19 ++-------
 scripts/loadup-mid-from-init.sh   |  20 ++--------
 sources/LOADUP-APPS.CM            |   2 +-
 sources/LOADUP-FULL.CM            |   2 +-
 sources/LOADUP-INIT.LISP          |   2 +-
 sources/LOADUP-LISP.CM            |   2 +-
 sources/MAKEINIT                  |  64 ++++++++++++++----------------
 sources/MAKEINIT.LCOM             | Bin 23370 -> 23621 bytes
 16 files changed, 92 insertions(+), 209 deletions(-)

diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml
index 6a4c89dd..e3d5b618 100644
--- a/.github/workflows/buildLoadup.yml
+++ b/.github/workflows/buildLoadup.yml
@@ -226,6 +226,7 @@ jobs:
           export DISPLAY=":0"
           PATH="$PWD/maiko:$PATH"
           scripts/loadup-all.sh -apps
+          scripts/loadup-db.sh
 
       - name: Build loadups release tar
         run: |
diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 6dfd8eb9..3831f10f 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -1,30 +1,28 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
+. scripts/loadup-setup.sh
+
 # was
 # cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
 # cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
 # just copy the files that are released
 
-./scripts/cpv tmp/init.dribble loadups
-./scripts/cpv tmp/lisp.dribble loadups
-./scripts/cpv tmp/full.dribble loadups
-./scripts/cpv tmp/fuller.dribble loadups
-./scripts/cpv tmp/whereis.dribble loadups
-
-./scripts/cpv tmp/fuller.database loadups
-
-./scripts/cpv tmp/full.sysout loadups
-./scripts/cpv tmp/lisp.sysout loadups
-./scripts/cpv tmp/whereis.hash loadups
-./scripts/cpv tmp/exports.all loadups
+./scripts/cpv ${LOADUP_WORKDIR}/full.sysout loadups
+./scripts/cpv ${LOADUP_WORKDIR}/lisp.sysout loadups
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv tmp/apps.sysout loadups
+    ./scripts/cpv ${LOADUP_WORKDIR}/apps.sysout loadups
 fi
 
+./scripts/cpv ${LOADUP_WORKDIR}/whereis.hash loadups
+./scripts/cpv ${LOADUP_WORKDIR}/exports.all loadups
+
+./scripts/cpv ${LOADUP_WORKDIR}/init.dribble loadups
+./scripts/cpv ${LOADUP_WORKDIR}/lisp.dribble loadups
+./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups
+./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups
+
diff --git a/scripts/loadup-all.sh b/scripts/loadup-all.sh
index c74f3280..5cc8f005 100755
--- a/scripts/loadup-all.sh
+++ b/scripts/loadup-all.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
+. scripts/loadup-setup.sh
+
 if [ "$1" = "-apps" ]; then
     apps="./scripts/loadup-apps-from-full.sh"
 else
@@ -21,7 +21,13 @@ fi
     ./scripts/loadup-aux.sh && \
     ./scripts/copy-all.sh $1
 
-echo "**** DONE ****"
+if [ $? -eq 0 ];
+then
+  echo "+++++ loadup-all.sh: SUCCESS +++++"
+else
+  echo "----- loadup-all.sh: FAILURE -----"
+fi
+
 
 
 
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index e3a48101..a00d54f0 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -1,32 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
-#set -x
+if [ ! -x run-medley ] ; then
+    echo must run from MEDLEYDIR ;
+    exit 1 ;
+fi
 
-# function to discover what directory this script is being executed from
-where_am_i() {
+. scripts/loadup-setup.sh
 
-    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
-
-    local SCRIPT_PATH="$1";
-
-    pushd . > '/dev/null';
-
-    while [ -h "$SCRIPT_PATH" ];
-    do
-        cd "$( dirname -- "$SCRIPT_PATH"; )";
-        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
-    done
-
-    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
-    SCRIPT_PATH="$( pwd; )";
-
-    popd  > '/dev/null';
-
-    echo "${SCRIPT_PATH}"
-}
-
-SCRIPTDIR=$(where_am_i "${BASH_SOURCE[0]:-$0}")
-export MEDLEYDIR=$(cd ${SCRIPTDIR} && cd .. && pwd)
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
 
@@ -41,33 +21,8 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-if [ -z "${SYSOUTDIR}" ]; then
-    export SYSOUTDIR=${MEDLEYDIR}/tmp
-fi
+./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_TMP}/full.sysout"
 
-if [ -z "${FULLSYSOUTPATH}" ]; then
-    FULLSYSOUTPATH=${SYSOUTDIR}/full.sysout
-    if [ ! -e ${FULLSYSOUTPATH} ]; then
-       FULLSYSOUTPATH=${MEDLEYDIR}/loadups/full.sysout
-    fi
-fi
+loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*"
 
-cd ${MEDLEYDIR}
-
-scr="-sc 1024x768 -g 1042x790"
-
-mkdir -p ${SYSOUTDIR}
-touch ${SYSOUTDIR}/loadup.timestamp
-
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${FULLSYSOUTPATH}"
-
-if [ ${SYSOUTDIR}/apps.sysout -nt ${SYSOUTDIR}/loadup.timestamp ]; then
-    echo ---- made ----
-    ls -l ${SYSOUTDIR}/apps.*
-    echo --------------
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l ${SYSOUTDIR}/apps.*
-    exit 1
-fi
 
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index 211accbe..5dffc2e1 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -1,28 +1,14 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-mkdir -p tmp
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-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)"' > ${LOADUP_WORKDIR}/loadup-aux.cm
 
-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
-./run-medley $scr -loadup "$MEDLEYDIR"/tmp/loadup-aux.cm tmp/full.sysout
+./run-medley $scr -loadup "${LOADUP_WORKDIR}/loadup-aux.cm ${LOADUP_WORKDIR}/full.sysout
 
-if [ tmp/whereis.hash -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/whereis.hash tmp/exports.all
-    echo --------------
-
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/whereis.hash tmp/exports.all
-    exit 1
-fi
+loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all"
diff --git a/scripts/loadup-db.sh b/scripts/loadup-db.sh
index 4b47839d..d0f89f7a 100755
--- a/scripts/loadup-db.sh
+++ b/scripts/loadup-db.sh
@@ -1,26 +1,22 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
-if [ ! -f run-medley ] ; then
+if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-touch tmp/db.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
-
-echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > tmp/db.cm
-./run-medley $scr -loadup "$MEDLEYDIR"/tmp/db.cm -n
-if [ tmp/fuller.database -nt tmp/db.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/fuller*
-    echo --------------
+./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh
 
+if [ $? -eq 0 ];
+then
+  echo "+++++ loadup-db.sh: SUCCESS +++++"
 else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/fuller*
-    exit 1
+  echo "----- loadup-db.sh: FAILURE -----"
 fi
+
+
+
+
+
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 14277016..509d5111 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -1,25 +1,13 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo must run from MEDLEYDIR ;
     exit 1 ;
 fi
-scr="-sc 1024x768 -g 1042x790"
 
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/tmp/lisp.sysout"
+./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout"
 
-if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/full.*
-    echo --------------
+loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*"
 
-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 9d97dc13..947f42af 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -1,26 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-scr="-sc 1024x768 -g 1042x790"
+. scripts/loadup-setup.sh
 
-mkdir -p tmp
-touch tmp/loadup.timestamp
+./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout
 
-./run-medley $scr -loadup "$MEDLEYDIR"/sources/LOADUP-INIT.LISP loadups/starter.sysout
-
-if [ tmp/init.dlinit -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/init.* tmp/RDSYS* tmp/I-NEW*
-    echo --------------
-
-else
-    echo XXXXX FAILURE XXXXX
-    exit 1
-fi
+loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 1c84b3e4..222466f8 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -1,25 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
+./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout
 
-
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" tmp/init-mid.sysout
-
-if [ tmp/lisp.sysout -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/lisp.*
-    echo --------------
-else
-    echo XXXXX FAILURE XXXXX
-    exit 1
-fi
+loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*"
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index 8208bcda..afb12fa3 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -1,26 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-mkdir -p "$MEDLEYDIR/tmp"
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
+./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
 
-./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout tmp/init.dlinit
-
-
-echo 
-if [ tmp/loadup.timestamp -nt tmp/init-mid.sysout ]; then
-    echo XXXXX FAILURE XXXXX
-    exit 1
-else
-    echo ---- made ----
-    ls -l tmp/init-mid.sysout
-    echo --------------
-fi
+loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout"
diff --git a/sources/LOADUP-APPS.CM b/sources/LOADUP-APPS.CM
index d41a71c3..f8d37768 100644
--- a/sources/LOADUP-APPS.CM
+++ b/sources/LOADUP-APPS.CM
@@ -1 +1 @@
-"

(PROGN
   (IL:MEDLEY-INIT-VARS 'IL:GREET)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD 
       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
       'IL:SYSLOAD
   )
   (IL:HARDRESET)
)
SHH
(PROGN 
   (IL:ENDLOADUP)
   (CLOS::LOAD-CLOS)
   (IL:|Apps.LOADUP|)
   (IL:MAKESYS
       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE SYSOUTDIR))(IL:L-CASE (QUOTE /apps.sysout)))
       :APPS)
)
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN
   (IL:MEDLEY-INIT-VARS 'IL:GREET)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD 
       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
       'IL:SYSLOAD
   )
   (IL:HARDRESET)
)
SHH
(PROGN 
   (IL:ENDLOADUP)
   (CLOS::LOAD-CLOS)
   (IL:|Apps.LOADUP|)
   (IL:MAKESYS
       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
       :APPS)
)
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM
index 5f13dad3..3ba363d4 100644
--- a/sources/LOADUP-FULL.CM
+++ b/sources/LOADUP-FULL.CM
@@ -1 +1 @@
-"

(PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET))
SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /tmp/full.sysout))) :FULL))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET))
SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/LOADUP-INIT.LISP b/sources/LOADUP-INIT.LISP
index 31cb03b3..016338d7 100644
--- a/sources/LOADUP-INIT.LISP
+++ b/sources/LOADUP-INIT.LISP
@@ -1,7 +1,7 @@
 (* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
 
 (LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
-(CNDIR (MEDLEYDIR "tmp"))
+(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
 (DRIBBLE "init.dribble")
 
 (UNADVISE)
diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM
index 641c5f83..150fb0ee 100644
--- a/sources/LOADUP-LISP.CM
+++ b/sources/LOADUP-LISP.CM
@@ -1 +1 @@
-"

(PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET))
SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /tmp/lisp.sysout)))))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET))
SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/MAKEINIT b/sources/MAKEINIT
index 3f939a04..b1cd3577 100644
--- a/sources/MAKEINIT
+++ b/sources/MAKEINIT
@@ -1,18 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "11-Jul-2022 20:00:23" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;3
 54607  
+
(FILECREATED "30-Jul-2023 23:39:21" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;4
 54459  
 
-      :CHANGES-TO (FNS I.FIXUPNUM I.FIXUPSYM)
+      :CHANGES-TO (FNS MAKEINITGREET)
 
-      :PREVIOUS-DATE "19-Jul-2021 23:50:29" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;2)
+      :PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;1)
 
 
-(* ; "
-Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT MAKEINITCOMS)
 
 (RPAQQ MAKEINITCOMS

@@ -83,7 +77,7 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (MAKEINITGREET

-  [LAMBDA NIL
                                          (* ; "Edited 11-Mar-2021 22:14 by larry")


+  [LAMBDA NIL
                                              (* ; "Edited 11-Mar-2021 22:14 by larry")


                                                             (* ; "Edited  5-Dec-2017 15:26 by rmk:")

 
     (* ;; "")

@@ -96,9 +90,11 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
     (DORENAME 'I)
     (DORENAME 'R)
     (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
-                          (MEDLEYDIR "tmp" "init.sysout" T)
-                          NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
-           (MEDLEYDIR "tmp" "init.dlinit" T])
+                      (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                             "/init.sysout")
+                      NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
+           (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                  "/init.dlinit"])
 )
 
 (FILESLOAD (SOURCE)
@@ -1053,28 +1049,26 @@ DONTCOPY
 (GLOBALVARS DLPRIMARYMAP DLSECONDARYMAP DLLOCKBITS DLLASTDOMINOPAGE DLIFPAGE DLNEXTPM DLPAGEMAPFP 
        FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX)
 )
-(PUTPROPS MAKEINIT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
- 1992 1998 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3971 4718 (MAKEINITGREET 3981 . 4716)) (4901 11286 (LOADMAKEINIT 4911 . 6114) (
-LOADMKIFILES 6116 . 6431) (RELOAD 6433 . 6916) (MAKEINIT 6918 . 10578) (MKI.START 10580 . 11284)) (
-11364 17082 (MKI.PASSFILE 11374 . 14984) (SCRATCHARRAY 14986 . 15635) (DOFORM 15637 . 16314) (
-CONSTFORMP 16316 . 16550) (NOTICECOMS 16552 . 16860) (EVALFORMAKEINIT 16862 . 17080)) (17083 19203 (
-I.ADDTOVAR 17093 . 17187) (I.DECLARE%: 17189 . 17465) (I.DEFINE-FILE-INFO 17467 . 17657) (
-I.FILECREATED 17659 . 18033) (I.PUTPROPS 18035 . 18148) (I.RPAQ 18150 . 18371) (I.RPAQQ 18373 . 18569)
- (I.RPAQ? 18571 . 18786) (I.SETTOPVAL 18788 . 19020) (I.NOUNDO 19022 . 19201)) (19839 26055 (
-I.ATOMNUMBER 19849 . 20340) (I.\ATOMCELL 20342 . 22095) (I.FIXUPNUM 22097 . 23022) (I.FIXUPPTR 23024
- . 23505) (I.FIXUPSYM 23507 . 24563) (I.WORDSPERNAMEENTRY 24565 . 25320) (I.SETSTKNTOFFSET 25322 . 
-26053)) (26087 27595 (MKI.ATOM 26097 . 26293) (MKI.IEEE 26295 . 27593)) (27692 28457 (MKI.DSET 27702
- . 27985) (MKI.ADDTO 27987 . 28172) (MKI.PUTPROP 28174 . 28455)) (28631 29183 (DUMPVP 28641 . 28738) (
-BOUTZEROS 28740 . 28819) (BIN16 28821 . 29002) (BOUT16 29004 . 29181)) (30074 52808 (DLFIXINIT 30084
- . 31059) (DLSORTSYSOUTPAGES 31061 . 36187) (DLNEXTFP 36189 . 36526) (DLLOCKEDPAGEP 36528 . 36742) (
-DLSETLOCKBIT 36744 . 37006) (DLCOPYPAGEMAP 37008 . 40059) (DLCOPYVMPAGE 40061 . 40451) (
-DLADDPAGEMAPENTRIES 40453 . 41268) (ASSIGNFILEPAGE 41270 . 42503) (ASSIGNFILEPAGERANGE 42505 . 42912) 
-(DLDUMPSYSOUT 42914 . 44666) (DLDUMPFPTOVP 44668 . 45707) (DLDUMPPAGEMAPS 45709 . 46409) (
-DLDUMPVMEMPAGES 46411 . 47067) (DLSETBOOTPTR 47069 . 47299) (DLDUMPARRAY 47301 . 47688) (
-DLMARKASDUMPED 47690 . 48143) (DLDUMPVMEMPAGE 48145 . 48833) (INSTALLDOMINO 48835 . 49482) (
-INSTALLDOMINO.DIRECT 49484 . 50636) (INSTALLNEWDOMINO 50638 . 52806)) (52830 54187 (DLPRINTFPTOVP 
-52840 . 53129) (PRINTPRIMARYMAP 53131 . 53845) (DLREADPAGEOFWORDS 53847 . 54014) (SETDIF 54016 . 54185
+  (FILEMAP (NIL (3843 4691 (MAKEINITGREET 3853 . 4689)) (4874 11259 (LOADMAKEINIT 4884 . 6087) (
+LOADMKIFILES 6089 . 6404) (RELOAD 6406 . 6889) (MAKEINIT 6891 . 10551) (MKI.START 10553 . 11257)) (
+11337 17055 (MKI.PASSFILE 11347 . 14957) (SCRATCHARRAY 14959 . 15608) (DOFORM 15610 . 16287) (
+CONSTFORMP 16289 . 16523) (NOTICECOMS 16525 . 16833) (EVALFORMAKEINIT 16835 . 17053)) (17056 19176 (
+I.ADDTOVAR 17066 . 17160) (I.DECLARE%: 17162 . 17438) (I.DEFINE-FILE-INFO 17440 . 17630) (
+I.FILECREATED 17632 . 18006) (I.PUTPROPS 18008 . 18121) (I.RPAQ 18123 . 18344) (I.RPAQQ 18346 . 18542)
+ (I.RPAQ? 18544 . 18759) (I.SETTOPVAL 18761 . 18993) (I.NOUNDO 18995 . 19174)) (19812 26028 (
+I.ATOMNUMBER 19822 . 20313) (I.\ATOMCELL 20315 . 22068) (I.FIXUPNUM 22070 . 22995) (I.FIXUPPTR 22997
+ . 23478) (I.FIXUPSYM 23480 . 24536) (I.WORDSPERNAMEENTRY 24538 . 25293) (I.SETSTKNTOFFSET 25295 . 
+26026)) (26060 27568 (MKI.ATOM 26070 . 26266) (MKI.IEEE 26268 . 27566)) (27665 28430 (MKI.DSET 27675
+ . 27958) (MKI.ADDTO 27960 . 28145) (MKI.PUTPROP 28147 . 28428)) (28604 29156 (DUMPVP 28614 . 28711) (
+BOUTZEROS 28713 . 28792) (BIN16 28794 . 28975) (BOUT16 28977 . 29154)) (30047 52781 (DLFIXINIT 30057
+ . 31032) (DLSORTSYSOUTPAGES 31034 . 36160) (DLNEXTFP 36162 . 36499) (DLLOCKEDPAGEP 36501 . 36715) (
+DLSETLOCKBIT 36717 . 36979) (DLCOPYPAGEMAP 36981 . 40032) (DLCOPYVMPAGE 40034 . 40424) (
+DLADDPAGEMAPENTRIES 40426 . 41241) (ASSIGNFILEPAGE 41243 . 42476) (ASSIGNFILEPAGERANGE 42478 . 42885) 
+(DLDUMPSYSOUT 42887 . 44639) (DLDUMPFPTOVP 44641 . 45680) (DLDUMPPAGEMAPS 45682 . 46382) (
+DLDUMPVMEMPAGES 46384 . 47040) (DLSETBOOTPTR 47042 . 47272) (DLDUMPARRAY 47274 . 47661) (
+DLMARKASDUMPED 47663 . 48116) (DLDUMPVMEMPAGE 48118 . 48806) (INSTALLDOMINO 48808 . 49455) (
+INSTALLDOMINO.DIRECT 49457 . 50609) (INSTALLNEWDOMINO 50611 . 52779)) (52803 54160 (DLPRINTFPTOVP 
+52813 . 53102) (PRINTPRIMARYMAP 53104 . 53818) (DLREADPAGEOFWORDS 53820 . 53987) (SETDIF 53989 . 54158
 )))))
 STOP
diff --git a/sources/MAKEINIT.LCOM b/sources/MAKEINIT.LCOM
index 9342cf53044d7cee8dea0863ec487e3fbf2ca714..3af36c6cc762407e7110b8077c0296917c5dad86 100644
GIT binary patch
delta 4778
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
RQ;Bk?__x#t4b_YQ{tJRyaESl_

delta 4528
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
AMF0Q*


From d2102bfe9b3069814ba7a6d28cf1c204e6cb2052 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 31 Jul 2023 01:07:39 -0700
Subject: [PATCH 02/28] Add new files left out from last commit; add RDSYS to
 library as part of loadups-all

---
 scripts/copy-all.sh            |  3 +++
 scripts/copy-db.sh             | 12 +++++++++++
 scripts/loadup-db-from-full.sh | 17 +++++++++++++++
 scripts/loadup-setup.sh        | 38 ++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100755 scripts/copy-db.sh
 create mode 100755 scripts/loadup-db-from-full.sh
 create mode 100644 scripts/loadup-setup.sh

diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 3831f10f..6c1f9053 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -26,3 +26,6 @@ fi
 ./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups
 ./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups
 
+./scripts/cpv ${LOADUP_WORKDIR}/RDSYS library
+./scripts/cpv ${LOADUP_WORKDIR}/RDSYS.LCOM library
+
diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh
new file mode 100755
index 00000000..25044ad1
--- /dev/null
+++ b/scripts/copy-db.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
+./scripts/cpv ${LOADUP_WORKDIR}/fuller.database loadups
+./scripts/cpv ${LOADUP_WORKDIR}/fuller.dribble loadups
+
diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh
new file mode 100755
index 00000000..b1793a11
--- /dev/null
+++ b/scripts/loadup-db-from-full.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
+DBCM="${LOADUP_WORKDIR}"/db.cm
+
+echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > ${DBCM}
+
+./run-medley $scr -loadup "${DBCM}" -full
+
+loadup_finish "loadup-db" "fuller.database" "fuller*"
+
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
new file mode 100644
index 00000000..194bde91
--- /dev/null
+++ b/scripts/loadup-setup.sh
@@ -0,0 +1,38 @@
+
+export MEDLEYDIR=`pwd`
+
+# echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%${LOADUP_WORKDIR}============="
+
+if [ -z "${LOADUP_WORKDIR}" ];
+then
+  export LOADUP_WORKDIR=/tmp/loadups-$$
+fi
+
+mkdir -p "${LOADUP_WORKDIR}"
+
+scr="-sc 1024x768 -g 1042x790"
+
+touch "${LOADUP_WORKDIR}"/loadup.timestamp
+
+loadup_finish () {
+  echo "===== ${1}"
+  if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+  then
+    echo "+++++ SUCCESS +++++"
+    exit_code=0
+  else
+    echo "----- FAILURE -----"
+    exit_code=1
+  fi
+  echo "===== files created ======"
+    shift; shift
+    for f in ${*};
+    do
+      ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
+    done
+  echo "======================================="
+  exit ${exit_code}
+}
+
+
+

From 656bb53ef609a674171cb57c849716b05bfd31cf Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 1 Aug 2023 12:08:55 -0700
Subject: [PATCH 03/28] WIP updating loadups scripts

---
 internal/MEDLEY-UTILS            |  28 +++++++++++++++-------------
 internal/MEDLEY-UTILS.LCOM       | Bin 7036 -> 7148 bytes
 scripts/cpv                      |  28 +++++++++++++++++++---------
 scripts/loadup-apps-from-full.sh |   4 +++-
 scripts/loadup-aux.sh            |  14 ++++++++++++--
 scripts/loadup-full-from-lisp.sh |   2 ++
 scripts/loadup-init.sh           |   2 ++
 scripts/loadup-lisp-from-mid.sh  |   2 ++
 scripts/loadup-mid-from-init.sh  |   4 +++-
 scripts/loadup-setup.sh          |  14 +++++++++-----
 sources/LOADUP-FULL              |  12 +++++-------
 sources/LOADUP-FULL.CM           |   2 +-
 sources/LOADUP-FULL.LCOM         | Bin 3665 -> 3505 bytes
 sources/LOADUP-LISP              |  13 ++++++-------
 sources/LOADUP-LISP.CM           |   2 +-
 sources/LOADUP-LISP.LCOM         | Bin 3566 -> 3508 bytes
 16 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index abf4d00e..c4c6c9ca 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "23-May-2023 07:10:58" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;12|
 10354  
+
(FILECREATED "31-Jul-2023 18:34:20" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;3|
 10550  
 
-      :EDIT-BY "lmm"
+      :CHANGES-TO (FNS MAKE-WHEREIS-HASH)
 
-      :CHANGES-TO (FNS GATHER-INFO)
-
-      :PREVIOUS-DATE "22-May-2023 22:57:21" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;11|)
+      :PREVIOUS-DATE "31-Jul-2023 18:07:23" 
+|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;2|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -156,24 +155,27 @@
 
                                                             "Edited September 29, 1986 by van Melle")

     (CNDIR (MEDLEYDIR "sources"))
     (LOAD 'FILESETS)
-    (GATHEREXPORTS EXPORTFILES (MEDLEYDIR "tmp" "exports.all" T))))
+    (GATHEREXPORTS EXPORTFILES (CONCAT '{DSK} (UNIX-GETENV "LOADUP_WORKDIR")
+                                      "/" "exports.all"))))
 
 (MAKE-WHEREIS-HASH

-  (LAMBDA NIL
                                               (* \; "Edited 12-Mar-2022 12:46 by rmk")


+  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 12-Mar-2022 12:46 by rmk")


                                                           (* \; "Edited 24-Mar-2021 13:26 by larry")

     (LET ((FILING.ENUMERATION.DEPTH 2)
           HASHFILE)
-         (DRIBBLE (MEDLEYDIR "tmp" "whereis.dribble" T))
-         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (MEDLEYDIR "tmp" "whereis.hash-tmp" T)
+         (DRIBBLE DRIBBLEFILE)
+         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                                                     "/" "whereis.hash-tmp")
                                :FILES
                                (|for|
 X |in|
 MEDLEY-FIX-DIRS |collect|
 (CONCAT (MEDLEYDIR X)
                                                                               "*.;"))
                                :HASH-FILE-SIZE 60000 :NEW T))
-         (RENAMEFILE HASHFILE (MEDLEYDIR "tmp" "whereis.hash" T))
+         (RENAMEFILE HASHFILE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                                     "/" "whereis.hash"))
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (624 7499 (GATHER-INFO 634 . 6162) (MAKE-FULLER-DB 6164 . 6854) (MEDLEY-FIX-LINKS 6856
- . 7253) (MEDLEY-FIX-DATES 7255 . 7497)) (8538 10331 (MAKE-EXPORTS-ALL 8548 . 9507) (MAKE-WHEREIS-HASH
- 9509 . 10329)))))
+  (FILEMAP (NIL (623 7498 (GATHER-INFO 633 . 6161) (MAKE-FULLER-DB 6163 . 6853) (MEDLEY-FIX-LINKS 6855
+ . 7252) (MEDLEY-FIX-DATES 7254 . 7496)) (8537 10527 (MAKE-EXPORTS-ALL 8547 . 9575) (MAKE-WHEREIS-HASH
+ 9577 . 10525)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM
index f4ccfed11a663695d6512a233e5e72a74bb90390..acc62cc9a2efcc4c6fc909397450126bcadb30e3 100644
GIT binary patch
delta 863
zcmaKqUvJV-7{*~5|I{S|h3#&>Yhr|p;yL{Tv@vL*XHbC_+ww<aGKqA9tiS|}nql|^
zCX(J5FZ~Mp3Vr}Th#$cVPwUWyOncE@oaa36^ZuUx%>KxIdYTY0_vDSo@rV}y=M_Oz
z1hjPT#t$dm(Q#qm6^3rlbKe(^mLGQ)!aNP^+6|OfaGr(v?A3U9;@$7fVLlkmfnn7~
z!-k9EOeRBhz3$AVqDyReflV{1eZ59X7Ev9dt&8pj@pwc{PBpvw;bDI~bPN9o3JgY)
zgg_}(RHIC6&M_giZ`e>*tAuM;h(&aptEhG*4NAizE!}L|oJPm4PgPJ(q0xZ(@6>Zl
zgVD^LjFw;GQT{Bk@#1#$k^efed*vt+@eg9#+06)jnBWzQq_POgsuLvXG)&8}L6V?k
z8YR^M5kb??J6xGK#Ax~75>ONngj)laAz)+^$ELV|?#R0DPR5hjG}HAw7DNfy2P_Em
zQ!`bq**IvMR#nq2|5mcKr2_)Z(u>6!30(Y_$(=i&uSFwKZzCR$KE4@b8~;ul-SodE
zZT~Q~wfLL+#(8)w$}1nhq6ii-)Ou(MSddqHU|zhq2w;?hPN}9SVF4U%z%U)XL?HX;
ziX=mwXf^VTCJs0RL>3eYFReMP##0Cw(V`8~2AKyX=#&d~<81vo32-POuK*SnL}1_c
z-HAJxX8PS}p9RdzAumk1t^uQmnCefp>-2A9AuIadxA*oaTOKi&Xescpp|kkT@zq~D
CNZbbi

delta 823
zcmZuv%Wl&^6m_DiqJag4M%}?>HY5v2o^hPV2n9LzxUq1YV7pC<x=9+ViEtirB0+^w
z#hMMsU%)r?M_BR^d;$x`R%ilb7FQ$t-1E}>tp2Ked3{7=u|2pJi9}?OsuW99seSdI
z9t49hylzZ_M%>FhxxpkV0wQFCB@!(wRFV)x!_dE+PZyKGA4QOhF2{q}mA|ABoTy%l
zIihJB9f&5g2#|4VS+Gr0DwR0HXs}9lcL|hHF;}P=ro}XesUFigYKLV`@<DfBeS9&V
zPyNP!<^fBxQidF5y6K6{b3nm#ihyb@)jnaa=yjlA*zUIDBG9hG&dkoKE9zYMA9sW*
zRZ1}8fp-Z{{ZZia{$?vb9%deAF}~f;UOe)!kP(Erz|X<mxVpP_(?98$+)uvdlJQU|
zlq+j%tl#Z8o(p9RZKhl7TsNKg`w=|Hbx2BbndkDtKvn?x?-%oMwJZ&S0D&w4T1^)*
z$)AA%mG!o0n0=8`xJ3{??{jNG_V6$hf7{DH*tQb?$h$XNj_$2(VYvdjV>X)>11w{3
zn60*1;sY@GqrvHU{Wa)o7NtG@Aed;nqTTUKjX_lctz&Dd2Nh|P=&yJ{ltknrRUum_
zo)b$LsLgs%mw~oax5WclOmxjR40vZWtt9CK^F{P-?1%njSsD+PV+0uUj(8;qDoXtF
a_!*>kT;AYD;bb@rd<69rc>C%2?cQ(byUT+B

diff --git a/scripts/cpv b/scripts/cpv
index 29fc5604..7f0e7ece 100755
--- a/scripts/cpv
+++ b/scripts/cpv
@@ -4,6 +4,13 @@
 # could extend with -r or copying multiple files
 # could change from cp to ln
 
+ln_or_cp () {
+    f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }')
+    d=$(df $(dirname $2) | tail -1 | awk '{ print $1 }')
+    if [ "$f" != "$d" ]; then cmd="cp -p"; else cmd="ln"; fi
+    echo $cmd
+}
+
 file="$1"
 dest="$2"
 
@@ -18,9 +25,15 @@ if [ -d "$dest" ]; then
     dest=$dest/`basename $file`
 fi
 
+# if (the new) $dest is a directory, then just bail
+if [ -d "$dest" ]; then
+    echo "Error: destination file ($dest) is a directory. Exiting."
+    exit 1
+fi
+
 # if no such file $dest then just copy
 if [ ! -f "$dest" ]; then
-    ln $file $dest		#WAS cp -p $file $dest 
+    $(ln_or_cp $file $dest) $file $dest
     exit 0
 fi
 
@@ -41,7 +54,7 @@ if [ $max -eq 0 ]; then		# no current versions
     new=2
 else
     if cmp -q $dest $dest.~$max~ >/dev/null 2>&1
-    then			# they're different 
+    then			# they're different
 	max=`expr $max + 1`	# make newer version
 	mv $dest $dest.~$max~
 	new=`expr $max + 1`
@@ -51,11 +64,8 @@ else
     fi
 fi
 
-# make new version
+# make new version and link it
 
-ln $file $dest.~$new~		# cp -p $file $dest.~$new~
-ln $dest.~$new~ $dest		# and link it
-
-
-
-	
+$(ln_or_cp $file $dest.~new~) $file $dest.~$new~
+rm -f $dest
+ln $dest.~$new~ $dest
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index a00d54f0..d7b6cb7d 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-apps-from-full"
+
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
 
@@ -21,7 +23,7 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_TMP}/full.sysout"
+./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_WORKDIR}/full.sysout"
 
 loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*"
 
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index 5dffc2e1..f0abfb47 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -7,8 +7,18 @@ fi
 
 . scripts/loadup-setup.sh
 
-echo '" (IL:MEDLEY-INIT-VARS)(IL:LOAD(QUOTE MEDLEY-UTILS))(IL:MAKE-EXPORTS-ALL)(IL:MAKE-WHEREIS-HASH)(IL:LOGOUT T)"' > ${LOADUP_WORKDIR}/loadup-aux.cm
+loadup_start "loadup-aux"
 
-./run-medley $scr -loadup "${LOADUP_WORKDIR}/loadup-aux.cm ${LOADUP_WORKDIR}/full.sysout
+cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF"
+"
+  (IL:MEDLEY-INIT-VARS)
+  (IL:LOAD(QUOTE MEDLEY-UTILS))
+  (IL:MAKE-EXPORTS-ALL)
+  (IL:MAKE-WHEREIS-HASH (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /whereis.dribble))))
+  (IL:LOGOUT T)
+"
+EOF
+
+./run-medley $scr -loadup "${LOADUP_WORKDIR}"/loadup-aux.cm "${LOADUP_WORKDIR}"/full.sysout
 
 loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all"
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 509d5111..351ab260 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-full-from-lisp"
+
 ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout"
 
 loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*"
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index 947f42af..4c7be321 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-init"
+
 ./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout
 
 loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 222466f8..283b8ba6 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-lisp-from-mid"
+
 ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout
 
 loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*"
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index afb12fa3..d5f4ff26 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
-./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
+loadup_start "loadup-mid-from-init"
+
+./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem ${LOADUP_WORKDIR}/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
 
 loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout"
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 194bde91..2fca51be 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -1,8 +1,6 @@
 
 export MEDLEYDIR=`pwd`
 
-# echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%${LOADUP_WORKDIR}============="
-
 if [ -z "${LOADUP_WORKDIR}" ];
 then
   export LOADUP_WORKDIR=/tmp/loadups-$$
@@ -14,8 +12,13 @@ scr="-sc 1024x768 -g 1042x790"
 
 touch "${LOADUP_WORKDIR}"/loadup.timestamp
 
+
+loadup_start () {
+  echo ">>>>> START ${1}"
+}
+
 loadup_finish () {
-  echo "===== ${1}"
+  local script_name=${1}
   if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
   then
     echo "+++++ SUCCESS +++++"
@@ -24,13 +27,14 @@ loadup_finish () {
     echo "----- FAILURE -----"
     exit_code=1
   fi
-  echo "===== files created ======"
+  echo "..... files created ....."
     shift; shift
     for f in ${*};
     do
       ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
     done
-  echo "======================================="
+  echo "<<<<< END ${script_name}"
+  echo ""
   exit ${exit_code}
 }
 
diff --git a/sources/LOADUP-FULL b/sources/LOADUP-FULL
index 104dbbee..55171e07 100644
--- a/sources/LOADUP-FULL
+++ b/sources/LOADUP-FULL
@@ -1,10 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;2
 4636   
+
(FILECREATED "31-Jul-2023 18:28:53" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;4
 4521   
 
       :CHANGES-TO (FNS LOADUP-FULL)
 
-      :PREVIOUS-DATE "12-Aug-2022 12:30:09" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;1
+      :PREVIOUS-DATE "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;3
 )
 
 
@@ -39,7 +39,7 @@
                (PRINTOUT T "FULL fonts loaded" T])
 
 (LOADUP-FULL

-  [LAMBDA NIL
                                                (* ; "Edited 18-Jan-2023 16:22 by FGH")


+  [LAMBDA (DRIBBLEFILE)
                                      (* ; "Edited 18-Jan-2023 16:22 by FGH")


                                                              (* ; "Edited 12-Aug-2022 11:17 by lmm")


                                                              (* ; "Edited 14-Jul-2022 12:32 by rmk")


                                                              (* ; "Edited 12-Jul-2022 21:57 by rmk")


@@ -55,9 +55,7 @@
     (PROGN (SETQ MEDLEYDIR)
            (CNDIR (MEDLEYDIR)))
     (MEDLEY-INIT-VARS)
-    (SETQ MAKESYSFILENAME (MEDLEYDIR "tmp" "full.sysout" T))
-    (SETQ MAKESYSNAME :MEDLEY)
-    (DRIBBLE (MEDLEYDIR "tmp" "full.dribble" T))
+    (DRIBBLE DRIBBLEFILE)
 
     (* ;; "BKSYSBUF stops page holding ")

 
@@ -88,5 +86,5 @@
 
 (FIXMETA
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (467 4598 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4348) (FIXMETA 4350 . 4596)))))
+  (FILEMAP (NIL (467 4483 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4233) (FIXMETA 4235 . 4481)))))
 STOP
diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM
index 3ba363d4..8ebb9a67 100644
--- a/sources/LOADUP-FULL.CM
+++ b/sources/LOADUP-FULL.CM
@@ -1 +1 @@
-"

(PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET))
SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN
  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
  (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
  (IL:HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/LOADUP-FULL.LCOM b/sources/LOADUP-FULL.LCOM
index 2db7026c038af6c2705c6700cec9fdbf4eb20cc1..518982003d573a98392da20b61201494ded38524 100644
GIT binary patch
delta 638
zcmZuvO>fgc5RH4NND3!FRJ5Rng+x**k;m)LoJis|Z0p#T?I_AIN-CfPT7h#xg8l`9
ze+LH??)(PMTsd;&2e6Kkh_5|7y?Ha5eLJ&X4?i8eAKqZpJf6>*x~4Ob)7IU#W-p$f
zTpA6if8{i%O^%9ua{l6C_F#%<FHuuFah&4!!d9!LVmi)Gr~hl9Gqq8x`y$}Igm*IT
z{ZphnZIh`A7Vn&01BR(nkt<Z(Q*JKax(ZwVRKD-t7tr7(qT3C4*$cjmg%|KvoJ4DZ
zK2+}>ey;3Pl&7~U@_e~cVzq=7dsv)SC)eXArEs=a;)+goif`5WCE51o0+3DU1yRa}
zAWOqggkCg^L8gWv>UaZ58ABk_EFNSaomR3x2m(I}vlK+uwotQ>@gz<JTzAWKNFgLR
z7Ce#gUKSlEqp;KGu-$davNwd_$+^Ka*Mh+|eVC2zNjgfq10VX<e(|H$d_<Ooqv7MI
z8HkV{N$chxA#>2}Mg2IC?rmhE&m;K~6MZgcI+C8`&OnB_e6x33*(X9hj?ygcB_ht!
sOfItDfX#}JSNB!Jh3d~|GtAD%)A<En=i^u9Ul`|5!E_1BJJ$^57wm4CiU0rr

delta 795
zcmZuv%Wl&^6paN`B<%(jfkY8p&4#2R(aiV}+g&-aEllj#*p8wsx=5W+QqrWNju1l7
zUm)_DKVXCMC42!JK7l0*uHE#7@M3)CoU8jdbHDHWc>JY*pQ-hi!&#kEE&@|@F6y$h
zeA_wWH6YhDN_8gbTp^Gq^W&50vk^>YP$5PTL~uQ@(P$7D4b$=He+fiNYL%+(xK=x~
zjMy@72Ay{xDnx+gXLW;vq=-tE3T&I#jm2T!CI`lKk?K@ie%uq->bLM~qiO>M&*)gu
zAj)%h4bK7_7&xYDHG<I3NhEmo=kAj`KTEetrR-_>!Si_uzv7r|<}fK8=D&ye@voLC
z<z)L+p&u2&1x#*d-^$f9&MBCo(`sQE&Ln8Neq{B5QxW=3*Yx`VFiiy4H_RTwrUI@L
z#X&Dd&!vL4d#-Ey-5AZ3waY+BgV+j#&;cg#ODM{KRF|O>8kkOK9kpXW928SCG-xd{
zdV#0}CYlYJx@J`6BAH5|)j``@JsX-=LntzM7MeG}^dL5`F4@;geaNW>yZsk_-F3Rw
zE{>+&xT*|VZQl!AoRmWBc$SZo;w<YYDjJm}(9cW2wOY6wxJ~Nn-sU4glqIMJeiTRT
z&<Wxw#*Oi6z?cFA-oKel$B@itvvHE|S~^Ek<Jtb!&R$bSOaOf(uNTv4WAtuva4;Q{
e3SdT(9-j~p*;+gOa5`V41UM!|W%X%G68-{W4!%PG

diff --git a/sources/LOADUP-LISP b/sources/LOADUP-LISP
index a2f54a70..140f17a9 100644
--- a/sources/LOADUP-LISP
+++ b/sources/LOADUP-LISP
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "27-Feb-2023 17:15:53" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;2|
 5263   
-
-      :EDIT-BY "lmm"
+
(FILECREATED "31-Jul-2023 18:22:53" |{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;2|
 5235   
 
       :CHANGES-TO (FNS LOADUP-LISP)
 
-      :PREVIOUS-DATE "12-Aug-2022 12:29:57" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;1|)
+      :PREVIOUS-DATE "27-Feb-2023 17:15:53" 
+|{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;1|)
 
 
 (PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -19,13 +18,13 @@
 (DEFINEQ
 
 (LOADUP-LISP

-  (LAMBDA NIL
                                               (* \; "Edited 26-Feb-2023 12:17 by lmm")


+  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 26-Feb-2023 12:17 by lmm")


                                                             (* \; "Edited 13-Jul-2022 14:09 by rmk")


                                                           (* \; "Edited  4-Mar-2022 19:13 by larry")


                                                            (* \; "Edited 29-Apr-2021 22:30 by rmk:")

     (SETQQ COMPILE.EXT LCOM)
     (MEDLEY-INIT-VARS)                                       (* \; "should be set earlier")

-    (DRIBBLE (MEDLEYDIR "tmp" "lisp.dribble" T))
+    (DRIBBLE DRIBBLEFILE)
     (FOR
 X IN
 BOOTLOADEDFILES DO
 (CL:UNLESS (MEMB X SYSFILES)
                                      (PRINTOUT T X " bootloaded" T)
                                      (SETQ SYSFILES (CONS X SYSFILES))))
@@ -124,5 +123,5 @@
 (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (654 5057 (LOADUP-LISP 664 . 5055)))))
+  (FILEMAP (NIL (649 5029 (LOADUP-LISP 659 . 5027)))))
 STOP
diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM
index 150fb0ee..d08bdff7 100644
--- a/sources/LOADUP-LISP.CM
+++ b/sources/LOADUP-LISP.CM
@@ -1 +1 @@
-"

(PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET))
SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN
  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
  (HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)':MEDLEY)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM
index 8e01adf6921b2a5f9bc93bd2c7f74f25e296318e..46a716e563eadef79e7c50efe17e315594777aa3 100644
GIT binary patch
delta 1107
zcmaiy&rcIU6vydeC@f6~5itRRkD{?PX|wZY+in}vFzt?YZMT%&Mc`!6RwNc`NHtMw
zdh$eKBoi+l{3r12-J1uaSN{UNnRs(Ht&BfN+{5g5-+tfs^CmN2=iko1T$`aJb>m?>
zg$7a}Rsm^&7)PxO({~TH_wN^X+r_<Bv)y`J+!41Ti~S_T|7tL-0<q%I>)z??J!oHU
z_Mo@B-vd3)8Vw(QH>cBS>1%FxTheq&4AOW~Ph4|qyzFrnaQhz<E@L4>Wyn+8uRgna
zud~-Go;K&w8JYoIh)DWqZFW)rpM610X!BDJ7+`x&sZ`_P3}RVJoqHY8Mj|^S@;M(a
z<KeP$+|>>veVWhxvIET{)K;0j-T-PLG+4RHDm=yOOojo?<xc))mCPt<DoK?@C5e*8
zK=vgI<p@J8T1qM$DjX^tDjX^tDjZ6jz2UfkLzrX{#UdfAKiDo&Frr{Y!H9wp1tSVZ
z)ZX%WD6Ov7?FPuGfO`$kfvf@YRVQFtLqYT4a<^ZS)14duF=frJ@vW3ocY@SS=K1m}
znR0xWRk^?A*O|+~G!O~{A0R;}12M8-J033wtDeJs$eVwBS_a78@HY66GnJ+$2z_j6
zlv+8F9(#2*hma^am68*<tl=ktW>I_^yJ%%(z3kR}mw5s6D&Ze<P#RtlS)j78S+1q{
zX5cY7HBdx>(e#`gFj4ZV_C{U0<m8FKad}c6I*KRJxMrbv6J6ADDBeXulfW<087+h2
zd-VNu2w}F(JSVs=J1B||<F+PqXD2>u28wSJE2Bi_pk54f4)o_?&JX=cm~&~8ggKk?
sWuiEoe5A?#(O4zyuf<k0g5pJNVJc%n9By|y-F9cY*=intjLk)U0+CP`(EtDd

delta 1187
zcmZ{iF>KR76owmDG;LCWP%DAj3Z6`dq^hIb+0Mllit5Bpuxh8lc4#Z6q>0){NmI22
z2?)x>!~(KdSeO}6k(e3T*eW4LCI(hko=M5IQt@#9@7=xsdw2IfF8*44b$^~RsoZW#
zG)rY5Oed<Y%CFnEXS$8U!zYDKw-A1hEe+`)4I<5*+e&m*(`8MBLG!S^)9)R0y6x5g
z20MF={oVGFK7fR?VVL!r<k)@<2A%x@h~>KDz<HZYCW8*G#&MK;2|%G@I*}?f+p$WX
zWdxRqyDq61O`e(l`t!Sc{a(9pq4t|}04mMNpj)OLNX2bPh}~XKgz#xBvr4FBJlc(p
zPk~UKYP!lqNc_)@g?EJ2<@YgRVq$j!zZ=mo9S!~Q&`Cz}q$RwJ4HZJc^z35Mu|UZ(
z7+nd-8iSfqS~n_|WL1r5Ro3WuHP0pEGRLLLrNX7mC7vci4eK?Kv4nrv>{wEcqZ~&$
zj&dC3ILdJpaptD&0zHEvi*gp;C^*Bv9RP&G2!|04BOFFJjBps?XCp*`;zqq{)&RW%
z%d2@dFct7uC4lcd5~>2OHFS$0tK%1tvlufSYumIvK%3D-va8q^4-C)8R#WgWuCZ?U
z+kVw>@zDqaeY6h`%AkZ@LICrvQn2CKmJcMWU6^YsU~(Bd)`zQkjZYLU{CP#3RI)U@
zHuYvM&mdK_D@8kSjhdeZnX&NG)N($D@sjKKuHglSSBX~CQRu8=FrZ*ytK>-5R^S;}
zHpnsy=i-?KtT0vd*3Hc-?!wYjf$dr-vn+fV7X^)l!}u*B&%$?c5D@q|J}=~0cpCq5
zJ%SjfX?S*UFAY>-;fHBcK;PffrvhQ&*O|3Riav9RLgeEoUPM0M5-X9<RFXtK8vaxk
zc9V|<%>R+BMETO}nm}3DpIutXX&^$g-#_m58?AOrL=1@C&e1`pb=YY(yKNDB1;pdt
K!O7d%h1ehet16=a


From f514dd04c2dac66cb8450dd6a0c56b18aad7ba1a Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 1 Aug 2023 22:59:01 -0700
Subject: [PATCH 04/28] First full pass at loadups revamp.

---
 internal/MEDLEY-UTILS            |  23 +++++++++++----------
 internal/MEDLEY-UTILS.LCOM       | Bin 7148 -> 7317 bytes
 scripts/copy-all.sh              |  27 ++++++++++++++-----------
 scripts/copy-db.sh               |   9 +++++++--
 scripts/cpv                      |   7 ++++---
 scripts/loadup-apps-from-full.sh |  33 ++++++++++++++++++++++++++++---
 scripts/loadup-aux.sh            |   8 ++++----
 scripts/loadup-db-from-full.sh   |  17 ++++++++++++----
 scripts/loadup-full-from-lisp.sh |  24 +++++++++++++++++++---
 scripts/loadup-full.sh           |  11 +++++------
 scripts/loadup-init.sh           |  27 ++++++++++++++++++++++---
 scripts/loadup-lisp-from-mid.sh  |  24 +++++++++++++++++++---
 scripts/loadup-mid-from-init.sh  |  18 ++++++++++++++---
 scripts/loadup-setup.sh          |  15 ++++++++++----
 14 files changed, 184 insertions(+), 59 deletions(-)

diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index c4c6c9ca..47d52d5e 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "31-Jul-2023 18:34:20" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;3|
 10550  
+
(FILECREATED " 1-Aug-2023 22:43:13" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|
 10714  
 
-      :CHANGES-TO (FNS MAKE-WHEREIS-HASH)
+      :CHANGES-TO (FNS MAKE-FULLER-DB)
 
-      :PREVIOUS-DATE "31-Jul-2023 18:07:23" 
-|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;2|)
+      :PREVIOUS-DATE " 1-Aug-2023 22:22:02" 
+|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;4|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -105,14 +105,17 @@
                                                           (* \; "Edited 20-Jun-2022 17:23 by larry")

     (FILESLOAD (SOURCE)
            FILESETS)
-    (DRIBBLE (MEDLEYDIR "tmp" "fuller.dribble" T T))
+    (DRIBBLE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                    "/" "fuller.dribble"))
     (DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
                         'FINDFILE))
     (GATHER-INFO
 'ALL)
     (MASTERSCOPE '(WHO CALLS XYZZY))
-    (DUMPDATABASE NIL (MKATOM (MEDLEYDIR "tmp" "fuller.database" T T)))
+    (DUMPDATABASE NIL (MKATOM (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                                     "/" "fuller.database")))
     (DRIBBLE)
-    (MAKESYS (MEDLEYDIR "tmp" "fuller.sysout" T T)
+    (MAKESYS (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                    "/" "fuller.sysout")
            "Welcome to Fuller sysout")))
 
 (MEDLEY-FIX-LINKS

@@ -175,7 +178,7 @@
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (623 7498 (GATHER-INFO 633 . 6161) (MAKE-FULLER-DB 6163 . 6853) (MEDLEY-FIX-LINKS 6855
- . 7252) (MEDLEY-FIX-DATES 7254 . 7496)) (8537 10527 (MAKE-EXPORTS-ALL 8547 . 9575) (MAKE-WHEREIS-HASH
- 9577 . 10525)))))
+  (FILEMAP (NIL (620 7662 (GATHER-INFO 630 . 6158) (MAKE-FULLER-DB 6160 . 7017) (MEDLEY-FIX-LINKS 7019
+ . 7416) (MEDLEY-FIX-DATES 7418 . 7660)) (8701 10691 (MAKE-EXPORTS-ALL 8711 . 9739) (MAKE-WHEREIS-HASH
+ 9741 . 10689)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM
index acc62cc9a2efcc4c6fc909397450126bcadb30e3..4a353503f00571c86078e35bfd0c85c18b11ca6d 100644
GIT binary patch
delta 773
zcmZva&2G~`5XWl{m6`*JPzB^R@+lFr@vgsOBMzJFrm^DK#&(*fDndzP5K<sgJ`RYK
zyaJWQlk_z>^*MM5#wm@G79Tvb|JnJ?f9?Ha|8jo5I|ib#<tK$|R0m33LwBihodp$h
zRRejiNL<r#iFW<FlI-fLs>-k$4;R^Z_1_Ltu9d1S&lk;DuvG8|n>I6vp4X+fN9GDj
zM6-#J|BznLR?qiEtnfw++$a{OUf4?%j)+GDG_Fw@O1Ue&k&K(eC+(-wZ620i=C7U~
z=U>b3H}SSyDdKv1fKRD-l@F>^v!Tm6A{pSR92=Tp&}1o)I)z@~ohc_G6~QSG%LX2M
zjfO8Ur@(vN2(7RNOHeS8(P3%W#guLly1kE}1SciwTEs~+jIfOmIALiU&*%lM5Qs*A
zhsBpl{E%_5O=x)mF9fhGxVT_ZBmz#sB0CFnw_+Gum%4Lrgc^H3)(&F-&A>lHGz*yT
zV+ME$K<;Og%juU47E@>~CzEUj^KbL%a)Fn@!SctArf#*m4f1QO*%%Agz34+fj62+m
z3lST>^Q3cyxq%xt&Fh(pw`DjQ&NI1$I_@a|I>tu;icR+bVnMav4xx!|6F3{3pATxF
g8(T}`+2_${lF2}wJ0gY$z+xO6-Vtx6&#sRC0@H88UH||9

delta 659
zcmZuu(Q4Z;6s^0L#f%ZQ!Pddx;wSsTL9%RD_Sl0GDYaK8_N-)GN?#I^K_I20Ngf7a
z`Gpm;uh?UMqo2}`sFXG(tkc8g>KvVOuB1QF?cwh)ZwPijFK4cYJOY@;#E%KOnsg7y
z$^q*i644mbtD6J4i#Hk#3s&RdVlrO+PvH^EG3|DmiB>6CPw*#)RHlb2YJ94Z6_^+W
z0jho(Z-bLWlp>XG!ert=T$JK#n)jv4mCF+obQr57Fss=3Xn5Dp_LG;!-zuxW+n<iB
zd405=j$iDlRnx`P<+&~wkL7{i02{u(XXB7UhaC$!kbnc#3!aGqPfNf)241GkW+niW
z5O}{+sJU2^Ney7=9J5~D0qlkMs`b4LX+zl)rEKMefQZ5o>#2LXX}6sNrNDFjR5HsM
zhtPv|+T|L6fWX-qD+<x&9{6;3v&*RD?O5C7O>p#HSv~lw?}!MnEK?2OkW}c^hjoC#
z`o5gaCYO!*&-ul2VW~TYU@gvns18SutorHUXgHr})Zg-mfPIqW&{D1vz70-K2aXB5
cs>|tUG}EH3#s}M$dB1E4M~!xEzdo<s0ow7M(*OVf

diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 6c1f9053..339dde4a 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -7,25 +7,30 @@ fi
 
 . scripts/loadup-setup.sh
 
+echo ">>>>> START ${script_name}"
+
 # was
 # cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
 # cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
 # just copy the files that are released
 
-./scripts/cpv ${LOADUP_WORKDIR}/full.sysout loadups
-./scripts/cpv ${LOADUP_WORKDIR}/lisp.sysout loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/full.sysout loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout loadups
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv ${LOADUP_WORKDIR}/apps.sysout loadups
+    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout loadups
 fi
 
-./scripts/cpv ${LOADUP_WORKDIR}/whereis.hash loadups
-./scripts/cpv ${LOADUP_WORKDIR}/exports.all loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/exports.all loadups
 
-./scripts/cpv ${LOADUP_WORKDIR}/init.dribble loadups
-./scripts/cpv ${LOADUP_WORKDIR}/lisp.dribble loadups
-./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups
-./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/init.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/full.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.dribble loadups
 
-./scripts/cpv ${LOADUP_WORKDIR}/RDSYS library
-./scripts/cpv ${LOADUP_WORKDIR}/RDSYS.LCOM library
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library
 
+echo "<<<<< END ${script_name}"
+echo ""
+exit 0
diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh
index 25044ad1..4c22b420 100755
--- a/scripts/copy-db.sh
+++ b/scripts/copy-db.sh
@@ -7,6 +7,11 @@ fi
 
 . scripts/loadup-setup.sh
 
-./scripts/cpv ${LOADUP_WORKDIR}/fuller.database loadups
-./scripts/cpv ${LOADUP_WORKDIR}/fuller.dribble loadups
+echo ">>>>> START ${script_name}"
 
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble loadups
+
+echo "<<<<< END ${script_name}"
+echo ""
+exit 0
diff --git a/scripts/cpv b/scripts/cpv
index 7f0e7ece..4d84e663 100755
--- a/scripts/cpv
+++ b/scripts/cpv
@@ -2,7 +2,6 @@
 
 # cpv file dest
 # could extend with -r or copying multiple files
-# could change from cp to ln
 
 ln_or_cp () {
     f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }')
@@ -14,9 +13,8 @@ ln_or_cp () {
 file="$1"
 dest="$2"
 
-
 if [ ! -f "$file" ]; then
-    echo no such file "$file"
+    echo "Error: no such file "$file". Exiting."
     exit 1
 fi
 
@@ -34,6 +32,7 @@ fi
 # if no such file $dest then just copy
 if [ ! -f "$dest" ]; then
     $(ln_or_cp $file $dest) $file $dest
+    echo "Added $(basename $dest) to $(dirname $dest)"
     exit 0
 fi
 
@@ -67,5 +66,7 @@ fi
 # make new version and link it
 
 $(ln_or_cp $file $dest.~new~) $file $dest.~$new~
+echo "Added $(basename $dest.~$new~) to $(dirname $dest.~$new~)"
 rm -f $dest
 ln $dest.~$new~ $dest
+echo "Linked $(basename $dest) to $(basename $dest.~$new~) in $(dirname $dest)"
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index d7b6cb7d..c4ba2e47 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -7,7 +7,7 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-apps-from-full"
+loadup_start
 
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
@@ -23,8 +23,35 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_WORKDIR}/full.sysout"
+cat >"${cmfile}" <<"EOF"
+"
 
-loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*"
+(PROGN
+   (IL:MEDLEY-INIT-VARS 'IL:GREET)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
+   (IL:LOAD 
+       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
+       'IL:SYSLOAD
+   )
+   (IL:HARDRESET)
+)
+SHH
+(PROGN 
+   (IL:ENDLOADUP)
+   (CLOS::LOAD-CLOS)
+   (IL:|Apps.LOADUP|)
+   (IL:MAKESYS
+       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
+       :APPS)
+)
+(IL:LOGOUT T)
 
+"
+EOF
 
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/full.sysout"
+
+loadup_finish "apps.sysout" "apps.*"
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index f0abfb47..4a48f779 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -7,9 +7,9 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-aux"
+loadup_start
 
-cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF"
+cat >"${cmfile}" <<"EOF"
 "
   (IL:MEDLEY-INIT-VARS)
   (IL:LOAD(QUOTE MEDLEY-UTILS))
@@ -19,6 +19,6 @@ cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF"
 "
 EOF
 
-./run-medley $scr -loadup "${LOADUP_WORKDIR}"/loadup-aux.cm "${LOADUP_WORKDIR}"/full.sysout
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}"/full.sysout
 
-loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all"
+loadup_finish "whereis.hash" "whereis.hash" "exports.all"
diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh
index b1793a11..c972491a 100755
--- a/scripts/loadup-db-from-full.sh
+++ b/scripts/loadup-db-from-full.sh
@@ -7,11 +7,20 @@ fi
 
 . scripts/loadup-setup.sh
 
-DBCM="${LOADUP_WORKDIR}"/db.cm
+loadup_start
 
-echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > ${DBCM}
+cat >"${cmfile}" <<"EOF"
+"
 
-./run-medley $scr -loadup "${DBCM}" -full
+(IL:MEDLEY-INIT-VARS)
+(IL:FILESLOAD MEDLEY-UTILS)
+(IL:MAKE-FULLER-DB)
+(IL:LOGOUT T)
 
-loadup_finish "loadup-db" "fuller.database" "fuller*"
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" -full
+
+loadup_finish "fuller.database" "fuller*"
 
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 351ab260..6c027ec4 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -7,9 +7,27 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-full-from-lisp"
+loadup_start
 
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout"
+cat >"${cmfile}" <<"EOF"
+"
 
-loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*"
+(PROGN
+  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
+  (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
+  (IL:HARDRESET)
+)
+SHH
+(PROGN
+  (IL:ENDLOADUP)
+  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/lisp.sysout"
+
+loadup_finish "full.sysout" "full.*"
 
diff --git a/scripts/loadup-full.sh b/scripts/loadup-full.sh
index a3a06fe1..a49fdd5a 100755
--- a/scripts/loadup-full.sh
+++ b/scripts/loadup-full.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo must run from MEDLEYDIR ;
     exit 1 ;
 fi
 
+. ./scripts/loadup-setup.sh
 
-    ./scripts/loadup-init.sh && \
-    ./scripts/loadup-mid-from-init.sh && \
-    ./scripts/loadup-lisp-from-mid.sh && \
-    ./scripts/loadup-full-from-lisp.sh
+./scripts/loadup-init.sh && \
+./scripts/loadup-mid-from-init.sh && \
+./scripts/loadup-lisp-from-mid.sh && \
+./scripts/loadup-full-from-lisp.sh
 
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index 4c7be321..e08f8ad5 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -7,8 +7,29 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-init"
+loadup_start
 
-./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout
+cat >"${cmfile}" <<"EOF"
+(* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
 
-loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
+(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
+(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
+(DRIBBLE "init.dribble")
+
+(UNADVISE)
+(ADVISE 'PAGEFULLFN '(RETURN))
+(ADVISE '(ERROR IN \DO-DEFINE-FILE-INFO) '(RETURN))
+(MOVD? 'NILL 'SETTEMPLATE)
+(DEFINEQ (RRE (LAMBDA (X Y) Y)))
+(MOVD? 'RRE 'READ-READER-ENVIRONMENT)
+
+(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
+(MAKEINITGREET)
+(DRIBBLE)
+(LOGOUT T)
+STOP
+EOF
+
+./run-medley $scr -loadup "${cmfile}" loadups/starter.sysout
+
+loadup_finish "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 283b8ba6..7233f85b 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -7,8 +7,26 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-lisp-from-mid"
+loadup_start
 
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout
+cat >"${cmfile}" <<"EOF"
+"
 
-loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*"
+(PROGN
+  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
+  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
+  (HARDRESET)
+)
+SHH
+(PROGN
+  (IL:ENDLOADUP)
+  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout))) :LISP)
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/init-mid.sysout"
+
+loadup_finish "lisp.sysout" "lisp.*"
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index d5f4ff26..7efc13e4 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -7,8 +7,20 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-mid-from-init"
+loadup_start
 
-./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem ${LOADUP_WORKDIR}/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
+cat >"${cmfile}" <<"EOF"
+"
+(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))
+(MOVD? (QUOTE NILL) (QUOTE CURSORP))
+(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER))
+(LOGOUT)
+"
+EOF
 
-loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout"
+./run-medley -prog "ldeinit" \
+             -NF \
+             -loadup "${cmfile}" ${scr} -vmem "${LOADUP_WORKDIR}/init-mid.sysout" \
+            "${LOADUP_WORKDIR}/init.dlinit"
+
+loadup_finish "init-mid.sysout" "init-mid.sysout"
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 2fca51be..98e15150 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -12,14 +12,20 @@ scr="-sc 1024x768 -g 1042x790"
 
 touch "${LOADUP_WORKDIR}"/loadup.timestamp
 
+script_name=$(basename "$0" ".sh")
+cmfile="${LOADUP_WORKDIR}/${script_name}.cm"
+
+
+######################################################################
 
 loadup_start () {
-  echo ">>>>> START ${1}"
+  echo ">>>>> START ${script_name}"
 }
 
 loadup_finish () {
-  local script_name=${1}
-  if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+  local exit_code
+  rm -f "${cmfile}"
+  if [ "${LOADUP_WORKDIR}/${1}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
   then
     echo "+++++ SUCCESS +++++"
     exit_code=0
@@ -28,7 +34,7 @@ loadup_finish () {
     exit_code=1
   fi
   echo "..... files created ....."
-    shift; shift
+    shift;
     for f in ${*};
     do
       ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
@@ -38,5 +44,6 @@ loadup_finish () {
   exit ${exit_code}
 }
 
+######################################################################
 
 

From f9838ac631c3bcd21a23786430fa006d8329ae36 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 1 Aug 2023 23:41:39 -0700
Subject: [PATCH 05/28] Handle case where files already exist in LOADUP_WORKDIR
 - show only the newly created files - not the old ones

---
 scripts/loadup-setup.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 98e15150..d838dca4 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -37,7 +37,13 @@ loadup_finish () {
     shift;
     for f in ${*};
     do
-      ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
+      for ff in $(ls -1 "${LOADUP_WORKDIR}"/$f);
+      do
+        if [ "${ff}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+        then
+          ls -l ${ff} 2>/dev/null | grep -v "^.*~[0-9]\+~$"
+        fi
+      done
     done
   echo "<<<<< END ${script_name}"
   echo ""

From 48c9a82a1c4aa795e46de09c7a9e5bad47274c17 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 01:02:12 -0700
Subject: [PATCH 06/28] Remove now obsolete sources/*.CM files; update README a
 bit

---
 scripts/README.md        | 22 +++++++++++++++++-----
 sources/LOADUP-APPS.CM   |  1 -
 sources/LOADUP-FULL.CM   |  1 -
 sources/LOADUP-INIT.LISP | 19 -------------------
 sources/LOADUP-LISP.CM   |  1 -
 sources/XREM.CM          |  6 ------
 6 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 sources/LOADUP-APPS.CM
 delete mode 100644 sources/LOADUP-FULL.CM
 delete mode 100644 sources/LOADUP-INIT.LISP
 delete mode 100644 sources/LOADUP-LISP.CM
 delete mode 100644 sources/XREM.CM

diff --git a/scripts/README.md b/scripts/README.md
index d4dd7da1..413d08e1 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -7,18 +7,30 @@ Loading from an old 'starter' sysout
 * loadup-mid-from-init.sh  -- phase 2 (creates init.sysout)
 * loadup-lisp-from-mid.sh  -- phase 3 (creates lisp.sysout)
 * loadup-full-from-lisp.sh -- phase 4 (creates full.sysout)
-* loadup-aux.sh            -- phase 5,(creates exports.all whereis.hash
+* loadup-apps-from-full.sh -- phase 5 (creates app.sysout, with notecards, rooms and clos; optional)
+* loadup-aux.sh            -- phase 6 (creates exports.all whereis.hash)
+* loadup-db-from-full.sh   -- phase 7 (makes unreleased 'fuller.sysout' and fuller.database)
 
-* loadup-full.sh  -- Phase 1-4 only
+All of these scripts read from and write to a directory specified by the env variable LOADUP_WORKDIR.
+LOADUP_WORKDIR defaults to /tmp/loadups-$$ (where $$ is the PID of the script). Note that all /tmp files
+are cleared after 10 days or upon system reboot. You can replicate the old work directory scheme 
+where files were never deleted automatically by simply setting LOADUP_WORKDIR to "./tmp"
 
-* loadup-db.sh    -- phase 6 (makes unreleased 'fuller.sysout' and fuller.database
-* copy-all.sh     -- copy loadups from tmp/ to loadups/ and library/
+* loadup-all.sh [-apps] -- Phases 1-4 & 6 (plus Phase 5 with -apps flag)
+* loadup-db.sh    -- phase 7 only based on full.syout in loadup directory
+
+These two scripts call the 7 scripts above as specified and then (if successful) copy (ln) the results
+to the loadups directory using a versioned copy.  The files are hardlinked into loadups from the workdir
+if workdir and loadups are on the same filesystem, otherwise they are copied. 
+
+* loadup-full.sh  -- Phases 1-4 only, no copy into loadups at the end.
 
 
 ## possibly handy scripts
 
 * lsee <lispfile>  -- show lisp file with font-control-characters rendered as linux color changes
-* cpv file1 file2  -- copies file1 to file2 (or directory name) adding versions
+* cpv file1 file2  -- hardlinks (or copies) file1 to file2 (or directory name) adding versions
+                      choice of hardlink or copy depends on whether the files are on the same filesystem.
 * restore-versions.sh -- pulls out old versions from git history and links in with medley versioning conventions
 
 ## Not useful anymore 
diff --git a/sources/LOADUP-APPS.CM b/sources/LOADUP-APPS.CM
deleted file mode 100644
index f8d37768..00000000
--- a/sources/LOADUP-APPS.CM
+++ /dev/null
@@ -1 +0,0 @@
-"

(PROGN
   (IL:MEDLEY-INIT-VARS 'IL:GREET)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD 
       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
       'IL:SYSLOAD
   )
   (IL:HARDRESET)
)
SHH
(PROGN 
   (IL:ENDLOADUP)
   (CLOS::LOAD-CLOS)
   (IL:|Apps.LOADUP|)
   (IL:MAKESYS
       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
       :APPS)
)
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM
deleted file mode 100644
index 8ebb9a67..00000000
--- a/sources/LOADUP-FULL.CM
+++ /dev/null
@@ -1 +0,0 @@
-"

(PROGN
  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
  (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
  (IL:HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/LOADUP-INIT.LISP b/sources/LOADUP-INIT.LISP
deleted file mode 100644
index 016338d7..00000000
--- a/sources/LOADUP-INIT.LISP
+++ /dev/null
@@ -1,19 +0,0 @@
-(* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
-
-(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
-(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
-(DRIBBLE "init.dribble")
-
-(UNADVISE)
-(ADVISE 'PAGEFULLFN '(RETURN))
-(ADVISE '(ERROR IN \DO-DEFINE-FILE-INFO) '(RETURN))
-(MOVD? 'NILL 'SETTEMPLATE)
-(DEFINEQ (RRE (LAMBDA (X Y) Y)))
-(MOVD? 'RRE 'READ-READER-ENVIRONMENT)
-
-(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
-(MAKEINITGREET)
-(DRIBBLE)
-(LOGOUT T)
-STOP
-
diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM
deleted file mode 100644
index d08bdff7..00000000
--- a/sources/LOADUP-LISP.CM
+++ /dev/null
@@ -1 +0,0 @@
-"

(PROGN
  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
  (HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)':MEDLEY)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/XREM.CM b/sources/XREM.CM
deleted file mode 100644
index 1cd92bd7..00000000
--- a/sources/XREM.CM
+++ /dev/null
@@ -1,6 +0,0 @@
-"
-(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))
-(MOVD? (QUOTE NILL) (QUOTE CURSORP))
-(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER))
-(LOGOUT)
-"

From 9d26047d8c844d1081029d7b2d0c1d40d450d6a8 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 13:41:36 -0700
Subject: [PATCH 07/28] WIP fixing up scripts/release_medley.sh and syncing
 with buildLoadup.yml

---
 .gitignore                   |  4 ++
 scripts/release-make-tars.sh | 86 ++++++++++++++++++++++++++++++++++++
 scripts/release-medley.sh    | 49 +++++---------------
 3 files changed, 101 insertions(+), 38 deletions(-)
 create mode 100755 scripts/release-make-tars.sh

diff --git a/.gitignore b/.gitignore
index aeae2bea..223b84a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 
 tmp/*
 
+# releases directory
+releases/*
+
+
 # all loadup files 
 
 loadups/exports.all
diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh
new file mode 100755
index 00000000..f62d9236
--- /dev/null
+++ b/scripts/release-make-tars.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+######### Functions ########
+check_exists () {
+  f="$1"
+  if [ -e "${f}" ]
+  then
+    echo "${f}"
+  else
+    echo "Warning: $f does not exist. $(basename ${f}) will not be included in release tars" 1>&2
+    echo " "
+  fi
+}
+######## End Functions #######
+
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+export MEDLEYDIR=`pwd`
+
+if [ -z "$1" ] ; then
+    tag=medley-$(date +%y%m%d)-$(date +%s)
+else
+    tag="$1"
+fi
+short_tag="${tag#medley-}"
+
+dirname=$(basename "${MEDLEYDIR}")
+if [ "${dirname}" = "medley" ]
+then
+  name_xform=" "
+else
+  uname | grep -q -i Linux
+  if [ $? -eq 0 ]
+  then
+    name_xform="--xform s/^${dirname}/medley/"
+  else
+    name_xform="-s /^${dirname}/medley/"
+  fi
+fi
+
+cd ..
+release_dir="${dirname}"/releases/"${short_tag}"
+mkdir -p "${release_dir}"
+
+echo making releases/${short_tag}/$tag-loadups.tgz
+
+
+tar -c -z -f "${release_dir}"/$tag-loadups.tgz                  \
+    ${name_xform}                                               \
+    "${dirname}"/loadups/lisp.sysout                            \
+    "${dirname}"/loadups/full.sysout                            \
+    $(check_exists "${dirname}/loadups/apps.sysout")            \
+    "${dirname}"/loadups/*.dribble                              \
+    "${dirname}"/loadups/whereis.hash                           \
+    "${dirname}"/loadups/exports.all                            \
+    $(check_exists "${dirname}/loadups/fuller.database")        ;
+
+echo making releases/${short_tag}/$tag-runtime.tgz
+
+tar -c -z -f "${release_dir}"/$tag-runtime.tgz                  \
+    --exclude "*~" --exclude "*#*"                              \
+    --exclude exports.all                                       \
+    ${name_xform}                                               \
+    "${dirname}"/clos                                           \
+    "${dirname}"/docs/dinfo                                     \
+    "${dirname}"/docs/man-page/medley.1.gz                      \
+    "${dirname}"/doctools                                       \
+    "${dirname}"/greetfiles                                     \
+    "${dirname}"/rooms                                          \
+    "${dirname}"/medley                                         \
+    "${dirname}"/run-medley                                     \
+    "${dirname}"/scripts                                        \
+    "${dirname}"/fonts/displayfonts                             \
+    "${dirname}"/fonts/altofonts                                \
+    "${dirname}"/fonts/adobe                                    \
+    "${dirname}"/fonts/postscriptfonts                          \
+    "${dirname}"/fonts/ipfonts                                  \
+    "${dirname}"/library                                        \
+    "${dirname}"/lispusers                                      \
+    "${dirname}"/sources                                        \
+    "${dirname}"/internal                                       ;
+
+echo "Done with release tars"
diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh
index a4fcf0df..3834d7e9 100755
--- a/scripts/release-medley.sh
+++ b/scripts/release-medley.sh
@@ -6,48 +6,21 @@ if [ ! -x run-medley ] ; then
     exit 1
 fi
 
-tag=$1
-
-if [ -z "$tag" ] ; then
-    tag=medley-`date +%y%m%d`
+if [ -z "$1" ] ; then
+    tag=medley-$(date +%y%m%d)-$(date +%s)
+else
+    tag="$1"
 fi
+short_tag="${tag#medley-}"
 
-cd ..
-
-echo making $tag-loadups.tgz
-
-tar cfz medley/tmp/$tag-loadups.tgz                       \
-    medley/loadups/lisp.sysout                            \
-    medley/loadups/full.sysout                            \
-    medley/loadups/fuller.database                        \
-    medley/loadups/*.dribble                              \
-    medley/loadups/whereis.hash                           \
-    medley/loadups//exports.all
-	
-echo making $tag-runtime.tgz
-
-tar cfz medley/tmp/$tag-runtime.tgz                       \
-    --exclude "*~" --exclude "*#*"                        \
-    medley/docs/dinfo                                     \
-    medley/doctools                                       \
-    medley/greetfiles                                     \
-    medley/rooms                                          \
-    medley/run-medley                                     \
-    medley/scripts                                        \
-    medley/fonts/displayfonts  medley/fonts/altofonts     \
-    medley/fonts/adobe                                    \
-    medley/fonts/postscriptfonts                          \
-    medley/library                                        \
-    medley/lispusers                                      \
-    medley/sources                                        \
-    medley/internal
-
-cd medley
+scripts/release-make-tars.sh "${tag}"
 
 echo making release
-sed s/'$tag'/$tag/g < release-notes.md > tmp/release-notes.md
-gh release create $tag -F tmp/release-notes.md -p -t $tag
+sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md
+gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag
 
 echo uploading
-gh release upload $tag tmp/$tag-loadups.tgz tmp/$tag-runtime.tgz --clobber
+gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber
+
+echo done
 

From 41608a1b27745e499f53cbaa61119ee29355f764 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 16:43:35 -0700
Subject: [PATCH 08/28] First pass a complete new make-release.sh

---
 scripts/README.md         |  7 +++++++
 scripts/release-medley.sh | 22 ++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/scripts/README.md b/scripts/README.md
index 413d08e1..6430dfb0 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -25,6 +25,13 @@ if workdir and loadups are on the same filesystem, otherwise they are copied.
 
 * loadup-full.sh  -- Phases 1-4 only, no copy into loadups at the end.
 
+## releases
+
+* release-medley.sh --  will create Medley release tars and upload as a release on github.  
+                      Arguments: -d to make a draft release. <Tag> to uses as a tag for this 
+                      release on github (defaults to meldey-\<date>-\<seconds since epoch>).
+
+* release-make-tars.sh -- will create the Medley release tars and store them in the releases directory.
 
 ## possibly handy scripts
 
diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh
index 3834d7e9..68f5f77f 100755
--- a/scripts/release-medley.sh
+++ b/scripts/release-medley.sh
@@ -6,6 +6,24 @@ if [ ! -x run-medley ] ; then
     exit 1
 fi
 
+if [ -z "$(which gh)" ]; then
+    echo "Error: this script requires gh (github cli) to be installed. Exiting."
+    exit 1
+fi
+
+gh auth status 2>&1 | grep -i -q "Logged in to github.com"
+if [ $? -ne 0 ]; then
+    echo 'Error: this script requires you to be logged into github.  Use "gh auth login" to do so. Exiting.'
+    exit 1
+fi
+
+if [ "$1" = "-d" ]; then
+    draft="-d"
+    shift
+else
+    draft=""
+fi
+
 if [ -z "$1" ] ; then
     tag=medley-$(date +%y%m%d)-$(date +%s)
 else
@@ -17,10 +35,10 @@ scripts/release-make-tars.sh "${tag}"
 
 echo making release
 sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md
-gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag
+gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag ${draft}
 
 echo uploading
 gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber
 
-echo done
+echo "Done with release ${tag}"
 

From 0c9744455c673bb5803d8bc9e82535fe3a70cd81 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 16:47:04 -0700
Subject: [PATCH 09/28] Fix scripts/README.md

---
 scripts/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/README.md b/scripts/README.md
index 6430dfb0..f62e02bb 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -28,8 +28,9 @@ if workdir and loadups are on the same filesystem, otherwise they are copied.
 ## releases
 
 * release-medley.sh --  will create Medley release tars and upload as a release on github.  
-                      Arguments: -d to make a draft release. <Tag> to uses as a tag for this 
+                      Arguments: -d to make a draft release. \<Tag> to use as a tag for this 
                       release on github (defaults to meldey-\<date>-\<seconds since epoch>).
+                      Both are optional.
 
 * release-make-tars.sh -- will create the Medley release tars and store them in the releases directory.
 

From 51ef95d30f0d0abc50366f36bed91b1f137f22e1 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 22:03:38 -0700
Subject: [PATCH 10/28] update buildLOadup.yml to use new
 scripts/release-make-tars.sh instead of its almost but not quite equivalent
 make tars code

---
 .github/workflows/buildLoadup.yml | 41 +++----------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml
index e3d5b618..54da1136 100644
--- a/.github/workflows/buildLoadup.yml
+++ b/.github/workflows/buildLoadup.yml
@@ -228,45 +228,10 @@ jobs:
           scripts/loadup-all.sh -apps
           scripts/loadup-db.sh
 
-      - name: Build loadups release tar
+      - name: Build release tars
         run: |
-          cd ..
-          mkdir -p medley/${TARBALL_DIR}
-          tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-loadups.tgz        \
-            medley/loadups/lisp.sysout               \
-            medley/loadups/full.sysout               \
-            medley/loadups/apps.sysout               \
-            medley/loadups/whereis.hash              \
-            medley/loadups/*.dribble                 \
-            medley/loadups/fuller.database           \
-            medley/loadups/exports.all
-
-      - name: Build runtime release tar
-        run: |
-          cd ..
-          mkdir -p medley/${TARBALL_DIR}
-          tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-runtime.tgz          \
-                     --exclude "*~" --exclude "*#*"              \
-                     --exclude exports.all                       \
-                     medley/clos                                 \
-                     medley/docs/dinfo                           \
-                     medley/docs/man-page/medley.1.gz            \
-                     medley/doctools                             \
-                     medley/greetfiles                           \
-                     medley/rooms                                \
-                     medley/medley                               \
-                     medley/run-medley                           \
-                     medley/scripts                              \
-                     medley/fonts/displayfonts                   \
-                     medley/fonts/altofonts                      \
-                     medley/fonts/adobe                          \
-                     medley/fonts/postscriptfonts                \
-                     medley/fonts/ipfonts                        \
-                     medley/library                              \
-                     medley/lispusers                            \
-                     medley/sources                              \
-                     medley/internal
-
+          scripts/release-make-tars.sh "${MEDLEY_RELEASE_TAG}"
+          mv releases/"${MEDLEY_SHORT_RELEASE_TAG}"/*.tgz "${TARBALL_DIR}"
 
       # Build the deb files as well as the tgz files
       - name: Build .deb files for 3 architectures

From e4c3a16ce497f45dbfcbd62056d7ac970298b1c7 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 31 Jul 2023 00:42:23 -0700
Subject: [PATCH 11/28] Remake loadup scripts to not use MEDLEYDIR/tmp as a
 working dir AND cleanly separate loadup-all from loadup-db; adjust
 buildLoadup.yml accordingly

---
 .github/workflows/buildLoadup.yml |   1 +
 scripts/copy-all.sh               |  28 ++++++-------
 scripts/loadup-all.sh             |  12 ++++--
 scripts/loadup-apps-from-full.sh  |  61 ++++------------------------
 scripts/loadup-aux.sh             |  22 ++--------
 scripts/loadup-db.sh              |  28 ++++++-------
 scripts/loadup-full-from-lisp.sh  |  18 ++-------
 scripts/loadup-init.sh            |  20 ++--------
 scripts/loadup-lisp-from-mid.sh   |  19 ++-------
 scripts/loadup-mid-from-init.sh   |  20 ++--------
 sources/LOADUP-APPS.CM            |   2 +-
 sources/LOADUP-FULL.CM            |   2 +-
 sources/LOADUP-INIT.LISP          |   2 +-
 sources/LOADUP-LISP.CM            |   2 +-
 sources/MAKEINIT                  |  64 ++++++++++++++----------------
 sources/MAKEINIT.LCOM             | Bin 23370 -> 23621 bytes
 16 files changed, 92 insertions(+), 209 deletions(-)

diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml
index 6a4c89dd..e3d5b618 100644
--- a/.github/workflows/buildLoadup.yml
+++ b/.github/workflows/buildLoadup.yml
@@ -226,6 +226,7 @@ jobs:
           export DISPLAY=":0"
           PATH="$PWD/maiko:$PATH"
           scripts/loadup-all.sh -apps
+          scripts/loadup-db.sh
 
       - name: Build loadups release tar
         run: |
diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 6dfd8eb9..3831f10f 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -1,30 +1,28 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
+. scripts/loadup-setup.sh
+
 # was
 # cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
 # cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
 # just copy the files that are released
 
-./scripts/cpv tmp/init.dribble loadups
-./scripts/cpv tmp/lisp.dribble loadups
-./scripts/cpv tmp/full.dribble loadups
-./scripts/cpv tmp/fuller.dribble loadups
-./scripts/cpv tmp/whereis.dribble loadups
-
-./scripts/cpv tmp/fuller.database loadups
-
-./scripts/cpv tmp/full.sysout loadups
-./scripts/cpv tmp/lisp.sysout loadups
-./scripts/cpv tmp/whereis.hash loadups
-./scripts/cpv tmp/exports.all loadups
+./scripts/cpv ${LOADUP_WORKDIR}/full.sysout loadups
+./scripts/cpv ${LOADUP_WORKDIR}/lisp.sysout loadups
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv tmp/apps.sysout loadups
+    ./scripts/cpv ${LOADUP_WORKDIR}/apps.sysout loadups
 fi
 
+./scripts/cpv ${LOADUP_WORKDIR}/whereis.hash loadups
+./scripts/cpv ${LOADUP_WORKDIR}/exports.all loadups
+
+./scripts/cpv ${LOADUP_WORKDIR}/init.dribble loadups
+./scripts/cpv ${LOADUP_WORKDIR}/lisp.dribble loadups
+./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups
+./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups
+
diff --git a/scripts/loadup-all.sh b/scripts/loadup-all.sh
index c74f3280..5cc8f005 100755
--- a/scripts/loadup-all.sh
+++ b/scripts/loadup-all.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
+. scripts/loadup-setup.sh
+
 if [ "$1" = "-apps" ]; then
     apps="./scripts/loadup-apps-from-full.sh"
 else
@@ -21,7 +21,13 @@ fi
     ./scripts/loadup-aux.sh && \
     ./scripts/copy-all.sh $1
 
-echo "**** DONE ****"
+if [ $? -eq 0 ];
+then
+  echo "+++++ loadup-all.sh: SUCCESS +++++"
+else
+  echo "----- loadup-all.sh: FAILURE -----"
+fi
+
 
 
 
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index e3a48101..a00d54f0 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -1,32 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
-#set -x
+if [ ! -x run-medley ] ; then
+    echo must run from MEDLEYDIR ;
+    exit 1 ;
+fi
 
-# function to discover what directory this script is being executed from
-where_am_i() {
+. scripts/loadup-setup.sh
 
-    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
-
-    local SCRIPT_PATH="$1";
-
-    pushd . > '/dev/null';
-
-    while [ -h "$SCRIPT_PATH" ];
-    do
-        cd "$( dirname -- "$SCRIPT_PATH"; )";
-        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
-    done
-
-    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
-    SCRIPT_PATH="$( pwd; )";
-
-    popd  > '/dev/null';
-
-    echo "${SCRIPT_PATH}"
-}
-
-SCRIPTDIR=$(where_am_i "${BASH_SOURCE[0]:-$0}")
-export MEDLEYDIR=$(cd ${SCRIPTDIR} && cd .. && pwd)
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
 
@@ -41,33 +21,8 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-if [ -z "${SYSOUTDIR}" ]; then
-    export SYSOUTDIR=${MEDLEYDIR}/tmp
-fi
+./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_TMP}/full.sysout"
 
-if [ -z "${FULLSYSOUTPATH}" ]; then
-    FULLSYSOUTPATH=${SYSOUTDIR}/full.sysout
-    if [ ! -e ${FULLSYSOUTPATH} ]; then
-       FULLSYSOUTPATH=${MEDLEYDIR}/loadups/full.sysout
-    fi
-fi
+loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*"
 
-cd ${MEDLEYDIR}
-
-scr="-sc 1024x768 -g 1042x790"
-
-mkdir -p ${SYSOUTDIR}
-touch ${SYSOUTDIR}/loadup.timestamp
-
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${FULLSYSOUTPATH}"
-
-if [ ${SYSOUTDIR}/apps.sysout -nt ${SYSOUTDIR}/loadup.timestamp ]; then
-    echo ---- made ----
-    ls -l ${SYSOUTDIR}/apps.*
-    echo --------------
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l ${SYSOUTDIR}/apps.*
-    exit 1
-fi
 
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index 211accbe..5dffc2e1 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -1,28 +1,14 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-mkdir -p tmp
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-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)"' > ${LOADUP_WORKDIR}/loadup-aux.cm
 
-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
-./run-medley $scr -loadup "$MEDLEYDIR"/tmp/loadup-aux.cm tmp/full.sysout
+./run-medley $scr -loadup "${LOADUP_WORKDIR}/loadup-aux.cm ${LOADUP_WORKDIR}/full.sysout
 
-if [ tmp/whereis.hash -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/whereis.hash tmp/exports.all
-    echo --------------
-
-else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/whereis.hash tmp/exports.all
-    exit 1
-fi
+loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all"
diff --git a/scripts/loadup-db.sh b/scripts/loadup-db.sh
index 4b47839d..d0f89f7a 100755
--- a/scripts/loadup-db.sh
+++ b/scripts/loadup-db.sh
@@ -1,26 +1,22 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
-if [ ! -f run-medley ] ; then
+if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-touch tmp/db.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
-
-echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > tmp/db.cm
-./run-medley $scr -loadup "$MEDLEYDIR"/tmp/db.cm -n
-if [ tmp/fuller.database -nt tmp/db.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/fuller*
-    echo --------------
+./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh
 
+if [ $? -eq 0 ];
+then
+  echo "+++++ loadup-db.sh: SUCCESS +++++"
 else
-    echo XXXXX FAILURE XXXXX
-    ls -l tmp/fuller*
-    exit 1
+  echo "----- loadup-db.sh: FAILURE -----"
 fi
+
+
+
+
+
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 14277016..509d5111 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -1,25 +1,13 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo must run from MEDLEYDIR ;
     exit 1 ;
 fi
-scr="-sc 1024x768 -g 1042x790"
 
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "$MEDLEYDIR/tmp/lisp.sysout"
+./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout"
 
-if [ tmp/full.sysout -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/full.*
-    echo --------------
+loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*"
 
-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 9d97dc13..947f42af 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -1,26 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-scr="-sc 1024x768 -g 1042x790"
+. scripts/loadup-setup.sh
 
-mkdir -p tmp
-touch tmp/loadup.timestamp
+./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout
 
-./run-medley $scr -loadup "$MEDLEYDIR"/sources/LOADUP-INIT.LISP loadups/starter.sysout
-
-if [ tmp/init.dlinit -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/init.* tmp/RDSYS* tmp/I-NEW*
-    echo --------------
-
-else
-    echo XXXXX FAILURE XXXXX
-    exit 1
-fi
+loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 1c84b3e4..222466f8 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -1,25 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -f run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
+./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout
 
-
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" tmp/init-mid.sysout
-
-if [ tmp/lisp.sysout -nt tmp/loadup.timestamp ]; then
-    
-    echo ---- made ----
-    ls -l tmp/lisp.*
-    echo --------------
-else
-    echo XXXXX FAILURE XXXXX
-    exit 1
-fi
+loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*"
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index 8208bcda..afb12fa3 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -1,26 +1,12 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo run from MEDLEYDIR
     exit 1
 fi
 
-mkdir -p "$MEDLEYDIR/tmp"
-touch tmp/loadup.timestamp
+. scripts/loadup-setup.sh
 
-scr="-sc 1024x768 -g 1042x790"
+./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
 
-./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout tmp/init.dlinit
-
-
-echo 
-if [ tmp/loadup.timestamp -nt tmp/init-mid.sysout ]; then
-    echo XXXXX FAILURE XXXXX
-    exit 1
-else
-    echo ---- made ----
-    ls -l tmp/init-mid.sysout
-    echo --------------
-fi
+loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout"
diff --git a/sources/LOADUP-APPS.CM b/sources/LOADUP-APPS.CM
index d41a71c3..f8d37768 100644
--- a/sources/LOADUP-APPS.CM
+++ b/sources/LOADUP-APPS.CM
@@ -1 +1 @@
-"

(PROGN
   (IL:MEDLEY-INIT-VARS 'IL:GREET)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD 
       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
       'IL:SYSLOAD
   )
   (IL:HARDRESET)
)
SHH
(PROGN 
   (IL:ENDLOADUP)
   (CLOS::LOAD-CLOS)
   (IL:|Apps.LOADUP|)
   (IL:MAKESYS
       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE SYSOUTDIR))(IL:L-CASE (QUOTE /apps.sysout)))
       :APPS)
)
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN
   (IL:MEDLEY-INIT-VARS 'IL:GREET)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD 
       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
       'IL:SYSLOAD
   )
   (IL:HARDRESET)
)
SHH
(PROGN 
   (IL:ENDLOADUP)
   (CLOS::LOAD-CLOS)
   (IL:|Apps.LOADUP|)
   (IL:MAKESYS
       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
       :APPS)
)
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM
index 5f13dad3..3ba363d4 100644
--- a/sources/LOADUP-FULL.CM
+++ b/sources/LOADUP-FULL.CM
@@ -1 +1 @@
-"

(PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET))
SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /tmp/full.sysout))) :FULL))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET))
SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/LOADUP-INIT.LISP b/sources/LOADUP-INIT.LISP
index 31cb03b3..016338d7 100644
--- a/sources/LOADUP-INIT.LISP
+++ b/sources/LOADUP-INIT.LISP
@@ -1,7 +1,7 @@
 (* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
 
 (LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
-(CNDIR (MEDLEYDIR "tmp"))
+(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
 (DRIBBLE "init.dribble")
 
 (UNADVISE)
diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM
index 641c5f83..150fb0ee 100644
--- a/sources/LOADUP-LISP.CM
+++ b/sources/LOADUP-LISP.CM
@@ -1 +1 @@
-"

(PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET))
SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(IL:L-CASE (QUOTE /tmp/lisp.sysout)))))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET))
SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/MAKEINIT b/sources/MAKEINIT
index 3f939a04..b1cd3577 100644
--- a/sources/MAKEINIT
+++ b/sources/MAKEINIT
@@ -1,18 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "11-Jul-2022 20:00:23" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;3
 54607  
+
(FILECREATED "30-Jul-2023 23:39:21" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;4
 54459  
 
-      :CHANGES-TO (FNS I.FIXUPNUM I.FIXUPSYM)
+      :CHANGES-TO (FNS MAKEINITGREET)
 
-      :PREVIOUS-DATE "19-Jul-2021 23:50:29" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>MAKEINIT.;2)
+      :PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;1)
 
 
-(* ; "
-Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT MAKEINITCOMS)
 
 (RPAQQ MAKEINITCOMS

@@ -83,7 +77,7 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (MAKEINITGREET

-  [LAMBDA NIL
                                          (* ; "Edited 11-Mar-2021 22:14 by larry")


+  [LAMBDA NIL
                                              (* ; "Edited 11-Mar-2021 22:14 by larry")


                                                             (* ; "Edited  5-Dec-2017 15:26 by rmk:")

 
     (* ;; "")

@@ -96,9 +90,11 @@ Copyright (c) 1982-1988, 1990-1992, 1998, 2021 by Venue & Xerox Corporation.
     (DORENAME 'I)
     (DORENAME 'R)
     (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
-                          (MEDLEYDIR "tmp" "init.sysout" T)
-                          NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
-           (MEDLEYDIR "tmp" "init.dlinit" T])
+                      (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                             "/init.sysout")
+                      NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
+           (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                  "/init.dlinit"])
 )
 
 (FILESLOAD (SOURCE)
@@ -1053,28 +1049,26 @@ DONTCOPY
 (GLOBALVARS DLPRIMARYMAP DLSECONDARYMAP DLLOCKBITS DLLASTDOMINOPAGE DLIFPAGE DLNEXTPM DLPAGEMAPFP 
        FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX)
 )
-(PUTPROPS MAKEINIT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
- 1992 1998 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3971 4718 (MAKEINITGREET 3981 . 4716)) (4901 11286 (LOADMAKEINIT 4911 . 6114) (
-LOADMKIFILES 6116 . 6431) (RELOAD 6433 . 6916) (MAKEINIT 6918 . 10578) (MKI.START 10580 . 11284)) (
-11364 17082 (MKI.PASSFILE 11374 . 14984) (SCRATCHARRAY 14986 . 15635) (DOFORM 15637 . 16314) (
-CONSTFORMP 16316 . 16550) (NOTICECOMS 16552 . 16860) (EVALFORMAKEINIT 16862 . 17080)) (17083 19203 (
-I.ADDTOVAR 17093 . 17187) (I.DECLARE%: 17189 . 17465) (I.DEFINE-FILE-INFO 17467 . 17657) (
-I.FILECREATED 17659 . 18033) (I.PUTPROPS 18035 . 18148) (I.RPAQ 18150 . 18371) (I.RPAQQ 18373 . 18569)
- (I.RPAQ? 18571 . 18786) (I.SETTOPVAL 18788 . 19020) (I.NOUNDO 19022 . 19201)) (19839 26055 (
-I.ATOMNUMBER 19849 . 20340) (I.\ATOMCELL 20342 . 22095) (I.FIXUPNUM 22097 . 23022) (I.FIXUPPTR 23024
- . 23505) (I.FIXUPSYM 23507 . 24563) (I.WORDSPERNAMEENTRY 24565 . 25320) (I.SETSTKNTOFFSET 25322 . 
-26053)) (26087 27595 (MKI.ATOM 26097 . 26293) (MKI.IEEE 26295 . 27593)) (27692 28457 (MKI.DSET 27702
- . 27985) (MKI.ADDTO 27987 . 28172) (MKI.PUTPROP 28174 . 28455)) (28631 29183 (DUMPVP 28641 . 28738) (
-BOUTZEROS 28740 . 28819) (BIN16 28821 . 29002) (BOUT16 29004 . 29181)) (30074 52808 (DLFIXINIT 30084
- . 31059) (DLSORTSYSOUTPAGES 31061 . 36187) (DLNEXTFP 36189 . 36526) (DLLOCKEDPAGEP 36528 . 36742) (
-DLSETLOCKBIT 36744 . 37006) (DLCOPYPAGEMAP 37008 . 40059) (DLCOPYVMPAGE 40061 . 40451) (
-DLADDPAGEMAPENTRIES 40453 . 41268) (ASSIGNFILEPAGE 41270 . 42503) (ASSIGNFILEPAGERANGE 42505 . 42912) 
-(DLDUMPSYSOUT 42914 . 44666) (DLDUMPFPTOVP 44668 . 45707) (DLDUMPPAGEMAPS 45709 . 46409) (
-DLDUMPVMEMPAGES 46411 . 47067) (DLSETBOOTPTR 47069 . 47299) (DLDUMPARRAY 47301 . 47688) (
-DLMARKASDUMPED 47690 . 48143) (DLDUMPVMEMPAGE 48145 . 48833) (INSTALLDOMINO 48835 . 49482) (
-INSTALLDOMINO.DIRECT 49484 . 50636) (INSTALLNEWDOMINO 50638 . 52806)) (52830 54187 (DLPRINTFPTOVP 
-52840 . 53129) (PRINTPRIMARYMAP 53131 . 53845) (DLREADPAGEOFWORDS 53847 . 54014) (SETDIF 54016 . 54185
+  (FILEMAP (NIL (3843 4691 (MAKEINITGREET 3853 . 4689)) (4874 11259 (LOADMAKEINIT 4884 . 6087) (
+LOADMKIFILES 6089 . 6404) (RELOAD 6406 . 6889) (MAKEINIT 6891 . 10551) (MKI.START 10553 . 11257)) (
+11337 17055 (MKI.PASSFILE 11347 . 14957) (SCRATCHARRAY 14959 . 15608) (DOFORM 15610 . 16287) (
+CONSTFORMP 16289 . 16523) (NOTICECOMS 16525 . 16833) (EVALFORMAKEINIT 16835 . 17053)) (17056 19176 (
+I.ADDTOVAR 17066 . 17160) (I.DECLARE%: 17162 . 17438) (I.DEFINE-FILE-INFO 17440 . 17630) (
+I.FILECREATED 17632 . 18006) (I.PUTPROPS 18008 . 18121) (I.RPAQ 18123 . 18344) (I.RPAQQ 18346 . 18542)
+ (I.RPAQ? 18544 . 18759) (I.SETTOPVAL 18761 . 18993) (I.NOUNDO 18995 . 19174)) (19812 26028 (
+I.ATOMNUMBER 19822 . 20313) (I.\ATOMCELL 20315 . 22068) (I.FIXUPNUM 22070 . 22995) (I.FIXUPPTR 22997
+ . 23478) (I.FIXUPSYM 23480 . 24536) (I.WORDSPERNAMEENTRY 24538 . 25293) (I.SETSTKNTOFFSET 25295 . 
+26026)) (26060 27568 (MKI.ATOM 26070 . 26266) (MKI.IEEE 26268 . 27566)) (27665 28430 (MKI.DSET 27675
+ . 27958) (MKI.ADDTO 27960 . 28145) (MKI.PUTPROP 28147 . 28428)) (28604 29156 (DUMPVP 28614 . 28711) (
+BOUTZEROS 28713 . 28792) (BIN16 28794 . 28975) (BOUT16 28977 . 29154)) (30047 52781 (DLFIXINIT 30057
+ . 31032) (DLSORTSYSOUTPAGES 31034 . 36160) (DLNEXTFP 36162 . 36499) (DLLOCKEDPAGEP 36501 . 36715) (
+DLSETLOCKBIT 36717 . 36979) (DLCOPYPAGEMAP 36981 . 40032) (DLCOPYVMPAGE 40034 . 40424) (
+DLADDPAGEMAPENTRIES 40426 . 41241) (ASSIGNFILEPAGE 41243 . 42476) (ASSIGNFILEPAGERANGE 42478 . 42885) 
+(DLDUMPSYSOUT 42887 . 44639) (DLDUMPFPTOVP 44641 . 45680) (DLDUMPPAGEMAPS 45682 . 46382) (
+DLDUMPVMEMPAGES 46384 . 47040) (DLSETBOOTPTR 47042 . 47272) (DLDUMPARRAY 47274 . 47661) (
+DLMARKASDUMPED 47663 . 48116) (DLDUMPVMEMPAGE 48118 . 48806) (INSTALLDOMINO 48808 . 49455) (
+INSTALLDOMINO.DIRECT 49457 . 50609) (INSTALLNEWDOMINO 50611 . 52779)) (52803 54160 (DLPRINTFPTOVP 
+52813 . 53102) (PRINTPRIMARYMAP 53104 . 53818) (DLREADPAGEOFWORDS 53820 . 53987) (SETDIF 53989 . 54158
 )))))
 STOP
diff --git a/sources/MAKEINIT.LCOM b/sources/MAKEINIT.LCOM
index 9342cf53044d7cee8dea0863ec487e3fbf2ca714..3af36c6cc762407e7110b8077c0296917c5dad86 100644
GIT binary patch
delta 4778
zcmaJ^Yit}>72a9fslBmXJ8}GqlU#2cXYJPOotb?)iR1Cktat3)oyqR3*G^m#W4nzL
zKO!foYE{LBzMur!a`}M-R4PIsAweJ809BzNRRvtNqN;e5RH~XvpbCTpQu_l56ux_B
zXT5d{mNk1H=iYnnIp6utxv&3Nc<raclZCx<U|{^}(ts3@WFpB!a%@O`>OyDh`PJox
z;k(ynS1t}OE)6d)%r7mh58p$d5IQ!3eZ(tC6|2OdU|=XDdC8Tz)#Xb|N9W1n3h{Uq
z)69`dLBHScCG)da7Un;7gQ&O9<4fo%EuPgBOH+yWle$Tw_W-$H%}qRT{C{iM5+tEu
zFcc%6p?FfsjA^+6%b+9aeT_qAR-4p~d~QI+33Ng@^nWheA@+IF%7mt8bZacDX%-n$
zqtK89=(4-BYThN#$KCxKbuRp^vd?bzIe(6Q&4wEG!-x52hm?oSHo1JU2vJiBeTtny
zViJiPnYdz+s6_G^eQID#v$V`42}g*d2yW&G1%phe){&wORd;T9eBl65^{f`RjI6HZ
zh!`VT5+gcHOQI3t9b8;lyyBl<Vn1FI!AQzb)Vz7NU}Pt-5MvVYatnJ&Fy<_{yncE0
zDi+8X*||UtmKU^3F%R*{v7iJOgmDW|3<RQmeIEL?s^MBsMo)Qs=)6;Pui&9Z^^t1U
zE#6n%AfW$fjfU?VHAnINsOEt!@%3GA?Pj>h^%2(}-F0-~wwd}iX24qZDYVenZ@WA%
zibVH2R!S*3i%0>Pq$hO0qN<ibMBKij7YPt;Qb`dp7~;cf4*nHov7#f|%S|PhW2ci?
zj6PF4)a&tyF`0}ShQ)OvVmL@n<qb<CA|RJm%s3iBD%7<LF#x5llZaA?*hZ`LOe{#~
z@w!4c93#e}#OLVl*QS8dTuwJKxUd+B7GK0xf~WYV=j*~jj}HLI=|e*h(X4!?pl4Jf
ziR2_449jlRt97Q8&5;C7rLWYt(husrZHi^2m26g-X2W6oiVXkz8+tbw@=7bD0AW2~
zFlQ+l3#SW%b@hPs+@ATlmO?wnaG}%w>9T(g@*mp~-sV#^$*Sv`zGtqd&}(<r&}rq<
z=jS=-7ww;Wxa&x5Bl|ty*~#Y$KKe?-3E?sN?}m_YmP(D*XM^x+0yky8lA-{ze<p62
z(?p6y$xPz3mNiT`8YW@xi-m}(#3%aE3XoiWG-qY?%oyAu+VjD1$?0;$5tJqRVdEDE
zJw8belYSD7mLrWZM2>}x7y;;YP?rchvj*(^{Ov9D-P<1#0(7>ib)SuzoOUX&Wh@<<
za_e7f>TyH#g{H&(H~4i&>`S-6q%PMYzwz}ddyvm8)fQUmt)^sWJD=Od#HKf0`lego
ztj2$Hbse2=esDt~s*y0VX&6L?LDaaRYFVHlg6n0oMwUn*0dOdWO6V?QSi;TYDI=#P
zK=u;cZRQauz~@$INQk70UO;k8h3)yKbZ$?vNsLs6Kvbf=dzTIbh<9{$p0F&ixCEBJ
z`|8TvmBrN+m@XD6KD&3n(1qwhTyZd(L=1#VO^)8;Us`$@5j3<O+6%kO2nsu}z#EK1
zPPRUe*?+bk=CncE+b%U>y8yIh0Jj6+8*Rt7h~wS1hp^ymyWd{$RQuxAoV(*1=AP*2
zw&z~#h;Pl^>Uaio&vdrgb3f~RY-?^}|F*f>t}ovXC1jfdY#qMSb#*t!Br<6Cy$8mi
zD548-#;(FiZ~Z`%z_<h)YY!7(wk$xx$i~sA9Et`(kk20ck{b%ex)-@Z#qV|3y9w5Y
z$dEiRI&EnKJbwh8u6^v=hhK$|EIXs0Ds;W)5oW{~$rz)c5?i<NBWHyg&errty{B<<
z-O(pY{il!m85JEJa0G7o1|cxmcgo}O1xdes^y7WWEsNdg^KErJ{d&1mJkx)M`THk#
z4BCeN>m5%YWU&(@=9s07vL+&WOiP>AG|1@2?i%{lJKq*Qq_YE)4aNHlU1=UDpD7%q
zZwxHCpL>KJ^LK(cCjDe1KxTmLQ3X)fr%VzIhjt7EL;_~l$1;q@O=V02;G)RJ8Ewi+
zm_$a@Cy++8l$9Ye+@YpYMtnk3nJA{gDGvY0u<@2C$OxU{$9_S`z$BqCR_Y0UKoHK}
z>L71oPaL5dX+2}u5(vezgp5?2(FzGOku}mrN~Na*kHT5tyAbhNq!bnZ2qf(=NSKx}
zY1$4*iuo1>E_MR69@W9-JV87!F2mx7q%PayC#7{^fW9RCz46HTCVi#F{mwbYI=kqz
z^1g8QO3S5EpACYEZob70{tNx$@1~!7+2xZ^vZyIW$dhTVKbVJpEPoEbmXQ5RVJ@M}
z*wTYYp+ISdJ{0`9!PMHe2d}bB0-=BuKuRJaVQxetKyW|e@(V7Pd*mk1Jm;8ZoGCXw
z{D(do@=6@`lW8r@d^-iIBMDWTWVsJ1K~vJGOGtUzHq38Aufj0b!l!J*+zhL&z#qtu
zArXgu%PqL7N3VBeX(;kdM!_khoRV#UScxM5LrMmDLMBNq#rUlP7^puONNkY^2T7?D
zidM{^s&jCKs4T+@G*@avU2#!Hl?Mfos#PUBjiQ4Uk7~-y>PYmw&)~}eK~SHRTEJ{2
zp0E=P5hdR9vzN)rD!H__xIDYIPL^jck%g5jYwIl2{WAL9h*P+!DK(!qbJIBkS)=48
zkU88W6Qp6@g2mu4HYU=iV|n2{`cW)4Ug@FDk!C@#k{4FouBB?daj&&=(rt0C+5+P{
z1nBh8xoHVnJ829&YwN`v%0P&sH_D=j>B{=B4jW<?V?z~UVP|Q{K4OUOImU`;R*>0D
zU;-;3W|-FA3Ctiy7#URbgB;%516h>9CCtH#4(LD)<={pQ$uSu%W0Luap|ma(DXpMi
zIo1VG{@_>-zP~+o;{b3CpgD0)P<WrQdv`Hc{p$ErkefPjLWE=4oH={XLVEVnWj4F>
z^4r`Oq`y9q5bmXo!+K-SHh<7F!`(I1g)~ba9FBItH1PF(?192{jf5OkUl}e@%6r3K
z*k=O<<p=TJg=Yj*VftM?DV_3F3of@cV!Pa>yx+XHD!JYNFDLa2<4e^OjZH58UML%~
zY{zhA(Lmoixol_GvR!agdZeQo5De3cBO`s+5V}<gr;8WX6`MCkF8=A}`^|zYTX{Hr
zedNLhs|`^$io9$uwE|&0y3A>oYI7`4BZzs{u(He&wh&$vtRWGgs<e!krC>&gg}^rq
zGK`<uGvhu)UJL~%tA=_Ao`DV>9YJcbZ7W4fwq<dO;)|IQ*~GTxYs&9ufrd{a55j#O
zomKFul$}`o_N&7QSd?4=33P&-$io!%2SFKG4&Z1xfFtzQs9%_({`e0&xS4pB+R|V0
zUWsr296wsW&4`U^`;p3l&Ew5N^~l9k<DR0leQ8AX3NO*q>MBA`2C`?E5tMiwub%{x
zF47zanS^L8g^+|Ww#N{J&KM}u9)mfYF)6lVHwnpb2Ae1KjAl)nc&#}RC`QBkoppF_
z5%#FyL2mC=tkw1jc2ek0d|!B<ZYCaX=$YrQ`W(L}&5z}C{P9#_bv(*sg7>?l5Flij
z8ZS0*H1K3s;Uas}e44k!P?-K_Z2kl*9FYJGD~a^Q%7+~lg9y0I=qpzi*6yC2TVN57
zYy^bzJV$Br^Sc<!M`E;7?-nBTxE=yWtm$vIdwj6!_J<_L4lRt6-G`A?1<t~|=mX;i
zRpuN9YE(w7$iNGO%;0iPdBs3oQQE|u%<p6#zH#vn<6c(o{cFODZ&#`p-*_rpE(hti
RQ;Bk?__x#t4b_YQ{tJRyaESl_

delta 4528
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
AMF0Q*


From 5b3cf9b7d58848e89da06c69081a6e7bf9e73931 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 31 Jul 2023 01:07:39 -0700
Subject: [PATCH 12/28] Add new files left out from last commit; add RDSYS to
 library as part of loadups-all

---
 scripts/copy-all.sh            |  3 +++
 scripts/copy-db.sh             | 12 +++++++++++
 scripts/loadup-db-from-full.sh | 17 +++++++++++++++
 scripts/loadup-setup.sh        | 38 ++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100755 scripts/copy-db.sh
 create mode 100755 scripts/loadup-db-from-full.sh
 create mode 100644 scripts/loadup-setup.sh

diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 3831f10f..6c1f9053 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -26,3 +26,6 @@ fi
 ./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups
 ./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups
 
+./scripts/cpv ${LOADUP_WORKDIR}/RDSYS library
+./scripts/cpv ${LOADUP_WORKDIR}/RDSYS.LCOM library
+
diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh
new file mode 100755
index 00000000..25044ad1
--- /dev/null
+++ b/scripts/copy-db.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
+./scripts/cpv ${LOADUP_WORKDIR}/fuller.database loadups
+./scripts/cpv ${LOADUP_WORKDIR}/fuller.dribble loadups
+
diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh
new file mode 100755
index 00000000..b1793a11
--- /dev/null
+++ b/scripts/loadup-db-from-full.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
+DBCM="${LOADUP_WORKDIR}"/db.cm
+
+echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > ${DBCM}
+
+./run-medley $scr -loadup "${DBCM}" -full
+
+loadup_finish "loadup-db" "fuller.database" "fuller*"
+
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
new file mode 100644
index 00000000..194bde91
--- /dev/null
+++ b/scripts/loadup-setup.sh
@@ -0,0 +1,38 @@
+
+export MEDLEYDIR=`pwd`
+
+# echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%${LOADUP_WORKDIR}============="
+
+if [ -z "${LOADUP_WORKDIR}" ];
+then
+  export LOADUP_WORKDIR=/tmp/loadups-$$
+fi
+
+mkdir -p "${LOADUP_WORKDIR}"
+
+scr="-sc 1024x768 -g 1042x790"
+
+touch "${LOADUP_WORKDIR}"/loadup.timestamp
+
+loadup_finish () {
+  echo "===== ${1}"
+  if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+  then
+    echo "+++++ SUCCESS +++++"
+    exit_code=0
+  else
+    echo "----- FAILURE -----"
+    exit_code=1
+  fi
+  echo "===== files created ======"
+    shift; shift
+    for f in ${*};
+    do
+      ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
+    done
+  echo "======================================="
+  exit ${exit_code}
+}
+
+
+

From ca3280f8946dc0596fb70ec9fa46600a02850d13 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 1 Aug 2023 12:08:55 -0700
Subject: [PATCH 13/28] WIP updating loadups scripts

---
 internal/MEDLEY-UTILS            |  28 +++++++++++++++-------------
 internal/MEDLEY-UTILS.LCOM       | Bin 7036 -> 7148 bytes
 scripts/cpv                      |  28 +++++++++++++++++++---------
 scripts/loadup-apps-from-full.sh |   4 +++-
 scripts/loadup-aux.sh            |  14 ++++++++++++--
 scripts/loadup-full-from-lisp.sh |   2 ++
 scripts/loadup-init.sh           |   2 ++
 scripts/loadup-lisp-from-mid.sh  |   2 ++
 scripts/loadup-mid-from-init.sh  |   4 +++-
 scripts/loadup-setup.sh          |  14 +++++++++-----
 sources/LOADUP-FULL              |  12 +++++-------
 sources/LOADUP-FULL.CM           |   2 +-
 sources/LOADUP-FULL.LCOM         | Bin 3665 -> 3505 bytes
 sources/LOADUP-LISP              |  13 ++++++-------
 sources/LOADUP-LISP.CM           |   2 +-
 sources/LOADUP-LISP.LCOM         | Bin 3566 -> 3508 bytes
 16 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index abf4d00e..c4c6c9ca 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "23-May-2023 07:10:58" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;12|
 10354  
+
(FILECREATED "31-Jul-2023 18:34:20" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;3|
 10550  
 
-      :EDIT-BY "lmm"
+      :CHANGES-TO (FNS MAKE-WHEREIS-HASH)
 
-      :CHANGES-TO (FNS GATHER-INFO)
-
-      :PREVIOUS-DATE "22-May-2023 22:57:21" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;11|)
+      :PREVIOUS-DATE "31-Jul-2023 18:07:23" 
+|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;2|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -156,24 +155,27 @@
 
                                                             "Edited September 29, 1986 by van Melle")

     (CNDIR (MEDLEYDIR "sources"))
     (LOAD 'FILESETS)
-    (GATHEREXPORTS EXPORTFILES (MEDLEYDIR "tmp" "exports.all" T))))
+    (GATHEREXPORTS EXPORTFILES (CONCAT '{DSK} (UNIX-GETENV "LOADUP_WORKDIR")
+                                      "/" "exports.all"))))
 
 (MAKE-WHEREIS-HASH

-  (LAMBDA NIL
                                               (* \; "Edited 12-Mar-2022 12:46 by rmk")


+  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 12-Mar-2022 12:46 by rmk")


                                                           (* \; "Edited 24-Mar-2021 13:26 by larry")

     (LET ((FILING.ENUMERATION.DEPTH 2)
           HASHFILE)
-         (DRIBBLE (MEDLEYDIR "tmp" "whereis.dribble" T))
-         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (MEDLEYDIR "tmp" "whereis.hash-tmp" T)
+         (DRIBBLE DRIBBLEFILE)
+         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                                                     "/" "whereis.hash-tmp")
                                :FILES
                                (|for|
 X |in|
 MEDLEY-FIX-DIRS |collect|
 (CONCAT (MEDLEYDIR X)
                                                                               "*.;"))
                                :HASH-FILE-SIZE 60000 :NEW T))
-         (RENAMEFILE HASHFILE (MEDLEYDIR "tmp" "whereis.hash" T))
+         (RENAMEFILE HASHFILE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                                     "/" "whereis.hash"))
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (624 7499 (GATHER-INFO 634 . 6162) (MAKE-FULLER-DB 6164 . 6854) (MEDLEY-FIX-LINKS 6856
- . 7253) (MEDLEY-FIX-DATES 7255 . 7497)) (8538 10331 (MAKE-EXPORTS-ALL 8548 . 9507) (MAKE-WHEREIS-HASH
- 9509 . 10329)))))
+  (FILEMAP (NIL (623 7498 (GATHER-INFO 633 . 6161) (MAKE-FULLER-DB 6163 . 6853) (MEDLEY-FIX-LINKS 6855
+ . 7252) (MEDLEY-FIX-DATES 7254 . 7496)) (8537 10527 (MAKE-EXPORTS-ALL 8547 . 9575) (MAKE-WHEREIS-HASH
+ 9577 . 10525)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM
index f4ccfed11a663695d6512a233e5e72a74bb90390..acc62cc9a2efcc4c6fc909397450126bcadb30e3 100644
GIT binary patch
delta 863
zcmaKqUvJV-7{*~5|I{S|h3#&>Yhr|p;yL{Tv@vL*XHbC_+ww<aGKqA9tiS|}nql|^
zCX(J5FZ~Mp3Vr}Th#$cVPwUWyOncE@oaa36^ZuUx%>KxIdYTY0_vDSo@rV}y=M_Oz
z1hjPT#t$dm(Q#qm6^3rlbKe(^mLGQ)!aNP^+6|OfaGr(v?A3U9;@$7fVLlkmfnn7~
z!-k9EOeRBhz3$AVqDyReflV{1eZ59X7Ev9dt&8pj@pwc{PBpvw;bDI~bPN9o3JgY)
zgg_}(RHIC6&M_giZ`e>*tAuM;h(&aptEhG*4NAizE!}L|oJPm4PgPJ(q0xZ(@6>Zl
zgVD^LjFw;GQT{Bk@#1#$k^efed*vt+@eg9#+06)jnBWzQq_POgsuLvXG)&8}L6V?k
z8YR^M5kb??J6xGK#Ax~75>ONngj)laAz)+^$ELV|?#R0DPR5hjG}HAw7DNfy2P_Em
zQ!`bq**IvMR#nq2|5mcKr2_)Z(u>6!30(Y_$(=i&uSFwKZzCR$KE4@b8~;ul-SodE
zZT~Q~wfLL+#(8)w$}1nhq6ii-)Ou(MSddqHU|zhq2w;?hPN}9SVF4U%z%U)XL?HX;
ziX=mwXf^VTCJs0RL>3eYFReMP##0Cw(V`8~2AKyX=#&d~<81vo32-POuK*SnL}1_c
z-HAJxX8PS}p9RdzAumk1t^uQmnCefp>-2A9AuIadxA*oaTOKi&Xescpp|kkT@zq~D
CNZbbi

delta 823
zcmZuv%Wl&^6m_DiqJag4M%}?>HY5v2o^hPV2n9LzxUq1YV7pC<x=9+ViEtirB0+^w
z#hMMsU%)r?M_BR^d;$x`R%ilb7FQ$t-1E}>tp2Ked3{7=u|2pJi9}?OsuW99seSdI
z9t49hylzZ_M%>FhxxpkV0wQFCB@!(wRFV)x!_dE+PZyKGA4QOhF2{q}mA|ABoTy%l
zIihJB9f&5g2#|4VS+Gr0DwR0HXs}9lcL|hHF;}P=ro}XesUFigYKLV`@<DfBeS9&V
zPyNP!<^fBxQidF5y6K6{b3nm#ihyb@)jnaa=yjlA*zUIDBG9hG&dkoKE9zYMA9sW*
zRZ1}8fp-Z{{ZZia{$?vb9%deAF}~f;UOe)!kP(Erz|X<mxVpP_(?98$+)uvdlJQU|
zlq+j%tl#Z8o(p9RZKhl7TsNKg`w=|Hbx2BbndkDtKvn?x?-%oMwJZ&S0D&w4T1^)*
z$)AA%mG!o0n0=8`xJ3{??{jNG_V6$hf7{DH*tQb?$h$XNj_$2(VYvdjV>X)>11w{3
zn60*1;sY@GqrvHU{Wa)o7NtG@Aed;nqTTUKjX_lctz&Dd2Nh|P=&yJ{ltknrRUum_
zo)b$LsLgs%mw~oax5WclOmxjR40vZWtt9CK^F{P-?1%njSsD+PV+0uUj(8;qDoXtF
a_!*>kT;AYD;bb@rd<69rc>C%2?cQ(byUT+B

diff --git a/scripts/cpv b/scripts/cpv
index 29fc5604..7f0e7ece 100755
--- a/scripts/cpv
+++ b/scripts/cpv
@@ -4,6 +4,13 @@
 # could extend with -r or copying multiple files
 # could change from cp to ln
 
+ln_or_cp () {
+    f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }')
+    d=$(df $(dirname $2) | tail -1 | awk '{ print $1 }')
+    if [ "$f" != "$d" ]; then cmd="cp -p"; else cmd="ln"; fi
+    echo $cmd
+}
+
 file="$1"
 dest="$2"
 
@@ -18,9 +25,15 @@ if [ -d "$dest" ]; then
     dest=$dest/`basename $file`
 fi
 
+# if (the new) $dest is a directory, then just bail
+if [ -d "$dest" ]; then
+    echo "Error: destination file ($dest) is a directory. Exiting."
+    exit 1
+fi
+
 # if no such file $dest then just copy
 if [ ! -f "$dest" ]; then
-    ln $file $dest		#WAS cp -p $file $dest 
+    $(ln_or_cp $file $dest) $file $dest
     exit 0
 fi
 
@@ -41,7 +54,7 @@ if [ $max -eq 0 ]; then		# no current versions
     new=2
 else
     if cmp -q $dest $dest.~$max~ >/dev/null 2>&1
-    then			# they're different 
+    then			# they're different
 	max=`expr $max + 1`	# make newer version
 	mv $dest $dest.~$max~
 	new=`expr $max + 1`
@@ -51,11 +64,8 @@ else
     fi
 fi
 
-# make new version
+# make new version and link it
 
-ln $file $dest.~$new~		# cp -p $file $dest.~$new~
-ln $dest.~$new~ $dest		# and link it
-
-
-
-	
+$(ln_or_cp $file $dest.~new~) $file $dest.~$new~
+rm -f $dest
+ln $dest.~$new~ $dest
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index a00d54f0..d7b6cb7d 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-apps-from-full"
+
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
 
@@ -21,7 +23,7 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_TMP}/full.sysout"
+./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_WORKDIR}/full.sysout"
 
 loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*"
 
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index 5dffc2e1..f0abfb47 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -7,8 +7,18 @@ fi
 
 . scripts/loadup-setup.sh
 
-echo '" (IL:MEDLEY-INIT-VARS)(IL:LOAD(QUOTE MEDLEY-UTILS))(IL:MAKE-EXPORTS-ALL)(IL:MAKE-WHEREIS-HASH)(IL:LOGOUT T)"' > ${LOADUP_WORKDIR}/loadup-aux.cm
+loadup_start "loadup-aux"
 
-./run-medley $scr -loadup "${LOADUP_WORKDIR}/loadup-aux.cm ${LOADUP_WORKDIR}/full.sysout
+cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF"
+"
+  (IL:MEDLEY-INIT-VARS)
+  (IL:LOAD(QUOTE MEDLEY-UTILS))
+  (IL:MAKE-EXPORTS-ALL)
+  (IL:MAKE-WHEREIS-HASH (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /whereis.dribble))))
+  (IL:LOGOUT T)
+"
+EOF
+
+./run-medley $scr -loadup "${LOADUP_WORKDIR}"/loadup-aux.cm "${LOADUP_WORKDIR}"/full.sysout
 
 loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all"
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 509d5111..351ab260 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-full-from-lisp"
+
 ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout"
 
 loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*"
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index 947f42af..4c7be321 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-init"
+
 ./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout
 
 loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 222466f8..283b8ba6 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start "loadup-lisp-from-mid"
+
 ./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout
 
 loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*"
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index afb12fa3..d5f4ff26 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -7,6 +7,8 @@ fi
 
 . scripts/loadup-setup.sh
 
-./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem tmp/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
+loadup_start "loadup-mid-from-init"
+
+./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem ${LOADUP_WORKDIR}/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
 
 loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout"
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 194bde91..2fca51be 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -1,8 +1,6 @@
 
 export MEDLEYDIR=`pwd`
 
-# echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%${LOADUP_WORKDIR}============="
-
 if [ -z "${LOADUP_WORKDIR}" ];
 then
   export LOADUP_WORKDIR=/tmp/loadups-$$
@@ -14,8 +12,13 @@ scr="-sc 1024x768 -g 1042x790"
 
 touch "${LOADUP_WORKDIR}"/loadup.timestamp
 
+
+loadup_start () {
+  echo ">>>>> START ${1}"
+}
+
 loadup_finish () {
-  echo "===== ${1}"
+  local script_name=${1}
   if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
   then
     echo "+++++ SUCCESS +++++"
@@ -24,13 +27,14 @@ loadup_finish () {
     echo "----- FAILURE -----"
     exit_code=1
   fi
-  echo "===== files created ======"
+  echo "..... files created ....."
     shift; shift
     for f in ${*};
     do
       ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
     done
-  echo "======================================="
+  echo "<<<<< END ${script_name}"
+  echo ""
   exit ${exit_code}
 }
 
diff --git a/sources/LOADUP-FULL b/sources/LOADUP-FULL
index 104dbbee..55171e07 100644
--- a/sources/LOADUP-FULL
+++ b/sources/LOADUP-FULL
@@ -1,10 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;2
 4636   
+
(FILECREATED "31-Jul-2023 18:28:53" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;4
 4521   
 
       :CHANGES-TO (FNS LOADUP-FULL)
 
-      :PREVIOUS-DATE "12-Aug-2022 12:30:09" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;1
+      :PREVIOUS-DATE "18-Jan-2023 16:23:36" {DSK}<home>frank>il>medley>gmedley>sources>LOADUP-FULL.;3
 )
 
 
@@ -39,7 +39,7 @@
                (PRINTOUT T "FULL fonts loaded" T])
 
 (LOADUP-FULL

-  [LAMBDA NIL
                                                (* ; "Edited 18-Jan-2023 16:22 by FGH")


+  [LAMBDA (DRIBBLEFILE)
                                      (* ; "Edited 18-Jan-2023 16:22 by FGH")


                                                              (* ; "Edited 12-Aug-2022 11:17 by lmm")


                                                              (* ; "Edited 14-Jul-2022 12:32 by rmk")


                                                              (* ; "Edited 12-Jul-2022 21:57 by rmk")


@@ -55,9 +55,7 @@
     (PROGN (SETQ MEDLEYDIR)
            (CNDIR (MEDLEYDIR)))
     (MEDLEY-INIT-VARS)
-    (SETQ MAKESYSFILENAME (MEDLEYDIR "tmp" "full.sysout" T))
-    (SETQ MAKESYSNAME :MEDLEY)
-    (DRIBBLE (MEDLEYDIR "tmp" "full.dribble" T))
+    (DRIBBLE DRIBBLEFILE)
 
     (* ;; "BKSYSBUF stops page holding ")

 
@@ -88,5 +86,5 @@
 
 (FIXMETA
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (467 4598 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4348) (FIXMETA 4350 . 4596)))))
+  (FILEMAP (NIL (467 4483 (LOADFULLFONTS 477 . 1918) (LOADUP-FULL 1920 . 4233) (FIXMETA 4235 . 4481)))))
 STOP
diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM
index 3ba363d4..8ebb9a67 100644
--- a/sources/LOADUP-FULL.CM
+++ b/sources/LOADUP-FULL.CM
@@ -1 +1 @@
-"

(PROGN(IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))(IL:LOADUP-FULL)(IL:HARDRESET))
SHH(PROGN(IL:ENDLOADUP)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN
  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
  (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
  (IL:HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/LOADUP-FULL.LCOM b/sources/LOADUP-FULL.LCOM
index 2db7026c038af6c2705c6700cec9fdbf4eb20cc1..518982003d573a98392da20b61201494ded38524 100644
GIT binary patch
delta 638
zcmZuvO>fgc5RH4NND3!FRJ5Rng+x**k;m)LoJis|Z0p#T?I_AIN-CfPT7h#xg8l`9
ze+LH??)(PMTsd;&2e6Kkh_5|7y?Ha5eLJ&X4?i8eAKqZpJf6>*x~4Ob)7IU#W-p$f
zTpA6if8{i%O^%9ua{l6C_F#%<FHuuFah&4!!d9!LVmi)Gr~hl9Gqq8x`y$}Igm*IT
z{ZphnZIh`A7Vn&01BR(nkt<Z(Q*JKax(ZwVRKD-t7tr7(qT3C4*$cjmg%|KvoJ4DZ
zK2+}>ey;3Pl&7~U@_e~cVzq=7dsv)SC)eXArEs=a;)+goif`5WCE51o0+3DU1yRa}
zAWOqggkCg^L8gWv>UaZ58ABk_EFNSaomR3x2m(I}vlK+uwotQ>@gz<JTzAWKNFgLR
z7Ce#gUKSlEqp;KGu-$davNwd_$+^Ka*Mh+|eVC2zNjgfq10VX<e(|H$d_<Ooqv7MI
z8HkV{N$chxA#>2}Mg2IC?rmhE&m;K~6MZgcI+C8`&OnB_e6x33*(X9hj?ygcB_ht!
sOfItDfX#}JSNB!Jh3d~|GtAD%)A<En=i^u9Ul`|5!E_1BJJ$^57wm4CiU0rr

delta 795
zcmZuv%Wl&^6paN`B<%(jfkY8p&4#2R(aiV}+g&-aEllj#*p8wsx=5W+QqrWNju1l7
zUm)_DKVXCMC42!JK7l0*uHE#7@M3)CoU8jdbHDHWc>JY*pQ-hi!&#kEE&@|@F6y$h
zeA_wWH6YhDN_8gbTp^Gq^W&50vk^>YP$5PTL~uQ@(P$7D4b$=He+fiNYL%+(xK=x~
zjMy@72Ay{xDnx+gXLW;vq=-tE3T&I#jm2T!CI`lKk?K@ie%uq->bLM~qiO>M&*)gu
zAj)%h4bK7_7&xYDHG<I3NhEmo=kAj`KTEetrR-_>!Si_uzv7r|<}fK8=D&ye@voLC
z<z)L+p&u2&1x#*d-^$f9&MBCo(`sQE&Ln8Neq{B5QxW=3*Yx`VFiiy4H_RTwrUI@L
z#X&Dd&!vL4d#-Ey-5AZ3waY+BgV+j#&;cg#ODM{KRF|O>8kkOK9kpXW928SCG-xd{
zdV#0}CYlYJx@J`6BAH5|)j``@JsX-=LntzM7MeG}^dL5`F4@;geaNW>yZsk_-F3Rw
zE{>+&xT*|VZQl!AoRmWBc$SZo;w<YYDjJm}(9cW2wOY6wxJ~Nn-sU4glqIMJeiTRT
z&<Wxw#*Oi6z?cFA-oKel$B@itvvHE|S~^Ek<Jtb!&R$bSOaOf(uNTv4WAtuva4;Q{
e3SdT(9-j~p*;+gOa5`V41UM!|W%X%G68-{W4!%PG

diff --git a/sources/LOADUP-LISP b/sources/LOADUP-LISP
index a2f54a70..140f17a9 100644
--- a/sources/LOADUP-LISP
+++ b/sources/LOADUP-LISP
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "27-Feb-2023 17:15:53" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;2|
 5263   
-
-      :EDIT-BY "lmm"
+
(FILECREATED "31-Jul-2023 18:22:53" |{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;2|
 5235   
 
       :CHANGES-TO (FNS LOADUP-LISP)
 
-      :PREVIOUS-DATE "12-Aug-2022 12:29:57" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;1|)
+      :PREVIOUS-DATE "27-Feb-2023 17:15:53" 
+|{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;1|)
 
 
 (PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -19,13 +18,13 @@
 (DEFINEQ
 
 (LOADUP-LISP

-  (LAMBDA NIL
                                               (* \; "Edited 26-Feb-2023 12:17 by lmm")


+  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 26-Feb-2023 12:17 by lmm")


                                                             (* \; "Edited 13-Jul-2022 14:09 by rmk")


                                                           (* \; "Edited  4-Mar-2022 19:13 by larry")


                                                            (* \; "Edited 29-Apr-2021 22:30 by rmk:")

     (SETQQ COMPILE.EXT LCOM)
     (MEDLEY-INIT-VARS)                                       (* \; "should be set earlier")

-    (DRIBBLE (MEDLEYDIR "tmp" "lisp.dribble" T))
+    (DRIBBLE DRIBBLEFILE)
     (FOR
 X IN
 BOOTLOADEDFILES DO
 (CL:UNLESS (MEMB X SYSFILES)
                                      (PRINTOUT T X " bootloaded" T)
                                      (SETQ SYSFILES (CONS X SYSFILES))))
@@ -124,5 +123,5 @@
 (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (654 5057 (LOADUP-LISP 664 . 5055)))))
+  (FILEMAP (NIL (649 5029 (LOADUP-LISP 659 . 5027)))))
 STOP
diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM
index 150fb0ee..d08bdff7 100644
--- a/sources/LOADUP-LISP.CM
+++ b/sources/LOADUP-LISP.CM
@@ -1 +1 @@
-"

(PROGN(LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))(LOADUP-LISP)(HARDRESET))
SHH(PROGN(IL:ENDLOADUP)':MEDLEY)(IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
(IL:LOGOUT T)

"
\ No newline at end of file
+"

(PROGN
  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
  (HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)':MEDLEY)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM
index 8e01adf6921b2a5f9bc93bd2c7f74f25e296318e..46a716e563eadef79e7c50efe17e315594777aa3 100644
GIT binary patch
delta 1107
zcmaiy&rcIU6vydeC@f6~5itRRkD{?PX|wZY+in}vFzt?YZMT%&Mc`!6RwNc`NHtMw
zdh$eKBoi+l{3r12-J1uaSN{UNnRs(Ht&BfN+{5g5-+tfs^CmN2=iko1T$`aJb>m?>
zg$7a}Rsm^&7)PxO({~TH_wN^X+r_<Bv)y`J+!41Ti~S_T|7tL-0<q%I>)z??J!oHU
z_Mo@B-vd3)8Vw(QH>cBS>1%FxTheq&4AOW~Ph4|qyzFrnaQhz<E@L4>Wyn+8uRgna
zud~-Go;K&w8JYoIh)DWqZFW)rpM610X!BDJ7+`x&sZ`_P3}RVJoqHY8Mj|^S@;M(a
z<KeP$+|>>veVWhxvIET{)K;0j-T-PLG+4RHDm=yOOojo?<xc))mCPt<DoK?@C5e*8
zK=vgI<p@J8T1qM$DjX^tDjX^tDjZ6jz2UfkLzrX{#UdfAKiDo&Frr{Y!H9wp1tSVZ
z)ZX%WD6Ov7?FPuGfO`$kfvf@YRVQFtLqYT4a<^ZS)14duF=frJ@vW3ocY@SS=K1m}
znR0xWRk^?A*O|+~G!O~{A0R;}12M8-J033wtDeJs$eVwBS_a78@HY66GnJ+$2z_j6
zlv+8F9(#2*hma^am68*<tl=ktW>I_^yJ%%(z3kR}mw5s6D&Ze<P#RtlS)j78S+1q{
zX5cY7HBdx>(e#`gFj4ZV_C{U0<m8FKad}c6I*KRJxMrbv6J6ADDBeXulfW<087+h2
zd-VNu2w}F(JSVs=J1B||<F+PqXD2>u28wSJE2Bi_pk54f4)o_?&JX=cm~&~8ggKk?
sWuiEoe5A?#(O4zyuf<k0g5pJNVJc%n9By|y-F9cY*=intjLk)U0+CP`(EtDd

delta 1187
zcmZ{iF>KR76owmDG;LCWP%DAj3Z6`dq^hIb+0Mllit5Bpuxh8lc4#Z6q>0){NmI22
z2?)x>!~(KdSeO}6k(e3T*eW4LCI(hko=M5IQt@#9@7=xsdw2IfF8*44b$^~RsoZW#
zG)rY5Oed<Y%CFnEXS$8U!zYDKw-A1hEe+`)4I<5*+e&m*(`8MBLG!S^)9)R0y6x5g
z20MF={oVGFK7fR?VVL!r<k)@<2A%x@h~>KDz<HZYCW8*G#&MK;2|%G@I*}?f+p$WX
zWdxRqyDq61O`e(l`t!Sc{a(9pq4t|}04mMNpj)OLNX2bPh}~XKgz#xBvr4FBJlc(p
zPk~UKYP!lqNc_)@g?EJ2<@YgRVq$j!zZ=mo9S!~Q&`Cz}q$RwJ4HZJc^z35Mu|UZ(
z7+nd-8iSfqS~n_|WL1r5Ro3WuHP0pEGRLLLrNX7mC7vci4eK?Kv4nrv>{wEcqZ~&$
zj&dC3ILdJpaptD&0zHEvi*gp;C^*Bv9RP&G2!|04BOFFJjBps?XCp*`;zqq{)&RW%
z%d2@dFct7uC4lcd5~>2OHFS$0tK%1tvlufSYumIvK%3D-va8q^4-C)8R#WgWuCZ?U
z+kVw>@zDqaeY6h`%AkZ@LICrvQn2CKmJcMWU6^YsU~(Bd)`zQkjZYLU{CP#3RI)U@
zHuYvM&mdK_D@8kSjhdeZnX&NG)N($D@sjKKuHglSSBX~CQRu8=FrZ*ytK>-5R^S;}
zHpnsy=i-?KtT0vd*3Hc-?!wYjf$dr-vn+fV7X^)l!}u*B&%$?c5D@q|J}=~0cpCq5
zJ%SjfX?S*UFAY>-;fHBcK;PffrvhQ&*O|3Riav9RLgeEoUPM0M5-X9<RFXtK8vaxk
zc9V|<%>R+BMETO}nm}3DpIutXX&^$g-#_m58?AOrL=1@C&e1`pb=YY(yKNDB1;pdt
K!O7d%h1ehet16=a


From 1c077d1b3d724cd68aefea51630bc20ac22ccb93 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 1 Aug 2023 22:59:01 -0700
Subject: [PATCH 14/28] First full pass at loadups revamp.

---
 internal/MEDLEY-UTILS            |  23 +++++++++++----------
 internal/MEDLEY-UTILS.LCOM       | Bin 7148 -> 7317 bytes
 scripts/copy-all.sh              |  27 ++++++++++++++-----------
 scripts/copy-db.sh               |   9 +++++++--
 scripts/cpv                      |   7 ++++---
 scripts/loadup-apps-from-full.sh |  33 ++++++++++++++++++++++++++++---
 scripts/loadup-aux.sh            |   8 ++++----
 scripts/loadup-db-from-full.sh   |  17 ++++++++++++----
 scripts/loadup-full-from-lisp.sh |  24 +++++++++++++++++++---
 scripts/loadup-full.sh           |  11 +++++------
 scripts/loadup-init.sh           |  27 ++++++++++++++++++++++---
 scripts/loadup-lisp-from-mid.sh  |  24 +++++++++++++++++++---
 scripts/loadup-mid-from-init.sh  |  18 ++++++++++++++---
 scripts/loadup-setup.sh          |  15 ++++++++++----
 14 files changed, 184 insertions(+), 59 deletions(-)

diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index c4c6c9ca..47d52d5e 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "31-Jul-2023 18:34:20" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;3|
 10550  
+
(FILECREATED " 1-Aug-2023 22:43:13" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|
 10714  
 
-      :CHANGES-TO (FNS MAKE-WHEREIS-HASH)
+      :CHANGES-TO (FNS MAKE-FULLER-DB)
 
-      :PREVIOUS-DATE "31-Jul-2023 18:07:23" 
-|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;2|)
+      :PREVIOUS-DATE " 1-Aug-2023 22:22:02" 
+|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;4|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -105,14 +105,17 @@
                                                           (* \; "Edited 20-Jun-2022 17:23 by larry")

     (FILESLOAD (SOURCE)
            FILESETS)
-    (DRIBBLE (MEDLEYDIR "tmp" "fuller.dribble" T T))
+    (DRIBBLE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                    "/" "fuller.dribble"))
     (DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
                         'FINDFILE))
     (GATHER-INFO
 'ALL)
     (MASTERSCOPE '(WHO CALLS XYZZY))
-    (DUMPDATABASE NIL (MKATOM (MEDLEYDIR "tmp" "fuller.database" T T)))
+    (DUMPDATABASE NIL (MKATOM (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                                     "/" "fuller.database")))
     (DRIBBLE)
-    (MAKESYS (MEDLEYDIR "tmp" "fuller.sysout" T T)
+    (MAKESYS (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
+                    "/" "fuller.sysout")
            "Welcome to Fuller sysout")))
 
 (MEDLEY-FIX-LINKS

@@ -175,7 +178,7 @@
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (623 7498 (GATHER-INFO 633 . 6161) (MAKE-FULLER-DB 6163 . 6853) (MEDLEY-FIX-LINKS 6855
- . 7252) (MEDLEY-FIX-DATES 7254 . 7496)) (8537 10527 (MAKE-EXPORTS-ALL 8547 . 9575) (MAKE-WHEREIS-HASH
- 9577 . 10525)))))
+  (FILEMAP (NIL (620 7662 (GATHER-INFO 630 . 6158) (MAKE-FULLER-DB 6160 . 7017) (MEDLEY-FIX-LINKS 7019
+ . 7416) (MEDLEY-FIX-DATES 7418 . 7660)) (8701 10691 (MAKE-EXPORTS-ALL 8711 . 9739) (MAKE-WHEREIS-HASH
+ 9741 . 10689)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM
index acc62cc9a2efcc4c6fc909397450126bcadb30e3..4a353503f00571c86078e35bfd0c85c18b11ca6d 100644
GIT binary patch
delta 773
zcmZva&2G~`5XWl{m6`*JPzB^R@+lFr@vgsOBMzJFrm^DK#&(*fDndzP5K<sgJ`RYK
zyaJWQlk_z>^*MM5#wm@G79Tvb|JnJ?f9?Ha|8jo5I|ib#<tK$|R0m33LwBihodp$h
zRRejiNL<r#iFW<FlI-fLs>-k$4;R^Z_1_Ltu9d1S&lk;DuvG8|n>I6vp4X+fN9GDj
zM6-#J|BznLR?qiEtnfw++$a{OUf4?%j)+GDG_Fw@O1Ue&k&K(eC+(-wZ620i=C7U~
z=U>b3H}SSyDdKv1fKRD-l@F>^v!Tm6A{pSR92=Tp&}1o)I)z@~ohc_G6~QSG%LX2M
zjfO8Ur@(vN2(7RNOHeS8(P3%W#guLly1kE}1SciwTEs~+jIfOmIALiU&*%lM5Qs*A
zhsBpl{E%_5O=x)mF9fhGxVT_ZBmz#sB0CFnw_+Gum%4Lrgc^H3)(&F-&A>lHGz*yT
zV+ME$K<;Og%juU47E@>~CzEUj^KbL%a)Fn@!SctArf#*m4f1QO*%%Agz34+fj62+m
z3lST>^Q3cyxq%xt&Fh(pw`DjQ&NI1$I_@a|I>tu;icR+bVnMav4xx!|6F3{3pATxF
g8(T}`+2_${lF2}wJ0gY$z+xO6-Vtx6&#sRC0@H88UH||9

delta 659
zcmZuu(Q4Z;6s^0L#f%ZQ!Pddx;wSsTL9%RD_Sl0GDYaK8_N-)GN?#I^K_I20Ngf7a
z`Gpm;uh?UMqo2}`sFXG(tkc8g>KvVOuB1QF?cwh)ZwPijFK4cYJOY@;#E%KOnsg7y
z$^q*i644mbtD6J4i#Hk#3s&RdVlrO+PvH^EG3|DmiB>6CPw*#)RHlb2YJ94Z6_^+W
z0jho(Z-bLWlp>XG!ert=T$JK#n)jv4mCF+obQr57Fss=3Xn5Dp_LG;!-zuxW+n<iB
zd405=j$iDlRnx`P<+&~wkL7{i02{u(XXB7UhaC$!kbnc#3!aGqPfNf)241GkW+niW
z5O}{+sJU2^Ney7=9J5~D0qlkMs`b4LX+zl)rEKMefQZ5o>#2LXX}6sNrNDFjR5HsM
zhtPv|+T|L6fWX-qD+<x&9{6;3v&*RD?O5C7O>p#HSv~lw?}!MnEK?2OkW}c^hjoC#
z`o5gaCYO!*&-ul2VW~TYU@gvns18SutorHUXgHr})Zg-mfPIqW&{D1vz70-K2aXB5
cs>|tUG}EH3#s}M$dB1E4M~!xEzdo<s0ow7M(*OVf

diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 6c1f9053..339dde4a 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -7,25 +7,30 @@ fi
 
 . scripts/loadup-setup.sh
 
+echo ">>>>> START ${script_name}"
+
 # was
 # cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
 # cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
 # just copy the files that are released
 
-./scripts/cpv ${LOADUP_WORKDIR}/full.sysout loadups
-./scripts/cpv ${LOADUP_WORKDIR}/lisp.sysout loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/full.sysout loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout loadups
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv ${LOADUP_WORKDIR}/apps.sysout loadups
+    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout loadups
 fi
 
-./scripts/cpv ${LOADUP_WORKDIR}/whereis.hash loadups
-./scripts/cpv ${LOADUP_WORKDIR}/exports.all loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/exports.all loadups
 
-./scripts/cpv ${LOADUP_WORKDIR}/init.dribble loadups
-./scripts/cpv ${LOADUP_WORKDIR}/lisp.dribble loadups
-./scripts/cpv ${LOADUP_WORKDIR}/full.dribble loadups
-./scripts/cpv ${LOADUP_WORKDIR}/whereis.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/init.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/full.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.dribble loadups
 
-./scripts/cpv ${LOADUP_WORKDIR}/RDSYS library
-./scripts/cpv ${LOADUP_WORKDIR}/RDSYS.LCOM library
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library
 
+echo "<<<<< END ${script_name}"
+echo ""
+exit 0
diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh
index 25044ad1..4c22b420 100755
--- a/scripts/copy-db.sh
+++ b/scripts/copy-db.sh
@@ -7,6 +7,11 @@ fi
 
 . scripts/loadup-setup.sh
 
-./scripts/cpv ${LOADUP_WORKDIR}/fuller.database loadups
-./scripts/cpv ${LOADUP_WORKDIR}/fuller.dribble loadups
+echo ">>>>> START ${script_name}"
 
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble loadups
+
+echo "<<<<< END ${script_name}"
+echo ""
+exit 0
diff --git a/scripts/cpv b/scripts/cpv
index 7f0e7ece..4d84e663 100755
--- a/scripts/cpv
+++ b/scripts/cpv
@@ -2,7 +2,6 @@
 
 # cpv file dest
 # could extend with -r or copying multiple files
-# could change from cp to ln
 
 ln_or_cp () {
     f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }')
@@ -14,9 +13,8 @@ ln_or_cp () {
 file="$1"
 dest="$2"
 
-
 if [ ! -f "$file" ]; then
-    echo no such file "$file"
+    echo "Error: no such file "$file". Exiting."
     exit 1
 fi
 
@@ -34,6 +32,7 @@ fi
 # if no such file $dest then just copy
 if [ ! -f "$dest" ]; then
     $(ln_or_cp $file $dest) $file $dest
+    echo "Added $(basename $dest) to $(dirname $dest)"
     exit 0
 fi
 
@@ -67,5 +66,7 @@ fi
 # make new version and link it
 
 $(ln_or_cp $file $dest.~new~) $file $dest.~$new~
+echo "Added $(basename $dest.~$new~) to $(dirname $dest.~$new~)"
 rm -f $dest
 ln $dest.~$new~ $dest
+echo "Linked $(basename $dest) to $(basename $dest.~$new~) in $(dirname $dest)"
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index d7b6cb7d..c4ba2e47 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -7,7 +7,7 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-apps-from-full"
+loadup_start
 
 export ROOMSDIR=${MEDLEYDIR}/rooms
 export CLOSDIR=${MEDLEYDIR}/clos
@@ -23,8 +23,35 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
-./run-medley $scr -loadup "${MEDLEYDIR}/sources/LOADUP-APPS.CM" "${LOADUP_WORKDIR}/full.sysout"
+cat >"${cmfile}" <<"EOF"
+"
 
-loadup_finish "loadup-apps-from-full" "apps.sysout" "apps.*"
+(PROGN
+   (IL:MEDLEY-INIT-VARS 'IL:GREET)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
+   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
+   (IL:LOAD 
+       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
+       'IL:SYSLOAD
+   )
+   (IL:HARDRESET)
+)
+SHH
+(PROGN 
+   (IL:ENDLOADUP)
+   (CLOS::LOAD-CLOS)
+   (IL:|Apps.LOADUP|)
+   (IL:MAKESYS
+       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
+       :APPS)
+)
+(IL:LOGOUT T)
 
+"
+EOF
 
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/full.sysout"
+
+loadup_finish "apps.sysout" "apps.*"
diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index f0abfb47..4a48f779 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -7,9 +7,9 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-aux"
+loadup_start
 
-cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF"
+cat >"${cmfile}" <<"EOF"
 "
   (IL:MEDLEY-INIT-VARS)
   (IL:LOAD(QUOTE MEDLEY-UTILS))
@@ -19,6 +19,6 @@ cat >"${LOADUP_WORKDIR}"/loadup-aux.cm <<"EOF"
 "
 EOF
 
-./run-medley $scr -loadup "${LOADUP_WORKDIR}"/loadup-aux.cm "${LOADUP_WORKDIR}"/full.sysout
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}"/full.sysout
 
-loadup_finish "loadup-aux" "whereis.hash" "whereis.hash" "exports.all"
+loadup_finish "whereis.hash" "whereis.hash" "exports.all"
diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh
index b1793a11..c972491a 100755
--- a/scripts/loadup-db-from-full.sh
+++ b/scripts/loadup-db-from-full.sh
@@ -7,11 +7,20 @@ fi
 
 . scripts/loadup-setup.sh
 
-DBCM="${LOADUP_WORKDIR}"/db.cm
+loadup_start
 
-echo '" (IL:MEDLEY-INIT-VARS)(IL:FILESLOAD MEDLEY-UTILS)(IL:MAKE-FULLER-DB)(IL:LOGOUT T)"' > ${DBCM}
+cat >"${cmfile}" <<"EOF"
+"
 
-./run-medley $scr -loadup "${DBCM}" -full
+(IL:MEDLEY-INIT-VARS)
+(IL:FILESLOAD MEDLEY-UTILS)
+(IL:MAKE-FULLER-DB)
+(IL:LOGOUT T)
 
-loadup_finish "loadup-db" "fuller.database" "fuller*"
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" -full
+
+loadup_finish "fuller.database" "fuller*"
 
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 351ab260..6c027ec4 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -7,9 +7,27 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-full-from-lisp"
+loadup_start
 
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-FULL.CM" "${LOADUP_WORKDIR}/lisp.sysout"
+cat >"${cmfile}" <<"EOF"
+"
 
-loadup_finish "loadup-full-from-lisp" "full.sysout" "full.*"
+(PROGN
+  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
+  (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
+  (IL:HARDRESET)
+)
+SHH
+(PROGN
+  (IL:ENDLOADUP)
+  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/lisp.sysout"
+
+loadup_finish "full.sysout" "full.*"
 
diff --git a/scripts/loadup-full.sh b/scripts/loadup-full.sh
index a3a06fe1..a49fdd5a 100755
--- a/scripts/loadup-full.sh
+++ b/scripts/loadup-full.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 
-export MEDLEYDIR=`pwd`
-
 if [ ! -x run-medley ] ; then
     echo must run from MEDLEYDIR ;
     exit 1 ;
 fi
 
+. ./scripts/loadup-setup.sh
 
-    ./scripts/loadup-init.sh && \
-    ./scripts/loadup-mid-from-init.sh && \
-    ./scripts/loadup-lisp-from-mid.sh && \
-    ./scripts/loadup-full-from-lisp.sh
+./scripts/loadup-init.sh && \
+./scripts/loadup-mid-from-init.sh && \
+./scripts/loadup-lisp-from-mid.sh && \
+./scripts/loadup-full-from-lisp.sh
 
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index 4c7be321..e08f8ad5 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -7,8 +7,29 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-init"
+loadup_start
 
-./run-medley $scr -loadup "${MEDLEYDIR}"/sources/LOADUP-INIT.LISP loadups/starter.sysout
+cat >"${cmfile}" <<"EOF"
+(* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
 
-loadup_finish "loadup-init" "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
+(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
+(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
+(DRIBBLE "init.dribble")
+
+(UNADVISE)
+(ADVISE 'PAGEFULLFN '(RETURN))
+(ADVISE '(ERROR IN \DO-DEFINE-FILE-INFO) '(RETURN))
+(MOVD? 'NILL 'SETTEMPLATE)
+(DEFINEQ (RRE (LAMBDA (X Y) Y)))
+(MOVD? 'RRE 'READ-READER-ENVIRONMENT)
+
+(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
+(MAKEINITGREET)
+(DRIBBLE)
+(LOGOUT T)
+STOP
+EOF
+
+./run-medley $scr -loadup "${cmfile}" loadups/starter.sysout
+
+loadup_finish "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 283b8ba6..7233f85b 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -7,8 +7,26 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-lisp-from-mid"
+loadup_start
 
-./run-medley $scr -loadup "$MEDLEYDIR/sources/LOADUP-LISP.CM" ${LOADUP_WORKDIR}/init-mid.sysout
+cat >"${cmfile}" <<"EOF"
+"
 
-loadup_finish "loadup-lisp-from-mid" "lisp.sysout" "lisp.*"
+(PROGN
+  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
+  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
+  (HARDRESET)
+)
+SHH
+(PROGN
+  (IL:ENDLOADUP)
+  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout))) :LISP)
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" "${LOADUP_WORKDIR}/init-mid.sysout"
+
+loadup_finish "lisp.sysout" "lisp.*"
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index d5f4ff26..7efc13e4 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -7,8 +7,20 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start "loadup-mid-from-init"
+loadup_start
 
-./run-medley -prog "ldeinit" -NF -loadup $MEDLEYDIR/sources/XREM.CM $scr -vmem ${LOADUP_WORKDIR}/init-mid.sysout ${LOADUP_WORKDIR}/init.dlinit
+cat >"${cmfile}" <<"EOF"
+"
+(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))
+(MOVD? (QUOTE NILL) (QUOTE CURSORP))
+(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER))
+(LOGOUT)
+"
+EOF
 
-loadup_finish "loadup-mid-from-init" "init-mid.sysout" "init-mid.sysout"
+./run-medley -prog "ldeinit" \
+             -NF \
+             -loadup "${cmfile}" ${scr} -vmem "${LOADUP_WORKDIR}/init-mid.sysout" \
+            "${LOADUP_WORKDIR}/init.dlinit"
+
+loadup_finish "init-mid.sysout" "init-mid.sysout"
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 2fca51be..98e15150 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -12,14 +12,20 @@ scr="-sc 1024x768 -g 1042x790"
 
 touch "${LOADUP_WORKDIR}"/loadup.timestamp
 
+script_name=$(basename "$0" ".sh")
+cmfile="${LOADUP_WORKDIR}/${script_name}.cm"
+
+
+######################################################################
 
 loadup_start () {
-  echo ">>>>> START ${1}"
+  echo ">>>>> START ${script_name}"
 }
 
 loadup_finish () {
-  local script_name=${1}
-  if [ "${LOADUP_WORKDIR}/${2}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+  local exit_code
+  rm -f "${cmfile}"
+  if [ "${LOADUP_WORKDIR}/${1}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
   then
     echo "+++++ SUCCESS +++++"
     exit_code=0
@@ -28,7 +34,7 @@ loadup_finish () {
     exit_code=1
   fi
   echo "..... files created ....."
-    shift; shift
+    shift;
     for f in ${*};
     do
       ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
@@ -38,5 +44,6 @@ loadup_finish () {
   exit ${exit_code}
 }
 
+######################################################################
 
 

From b0ec2476d569ff230f2b20ca6107c487dda5775b Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Tue, 1 Aug 2023 23:41:39 -0700
Subject: [PATCH 15/28] Handle case where files already exist in LOADUP_WORKDIR
 - show only the newly created files - not the old ones

---
 scripts/loadup-setup.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 98e15150..d838dca4 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -37,7 +37,13 @@ loadup_finish () {
     shift;
     for f in ${*};
     do
-      ls -l "${LOADUP_WORKDIR}"/$f 2>/dev/null
+      for ff in $(ls -1 "${LOADUP_WORKDIR}"/$f);
+      do
+        if [ "${ff}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+        then
+          ls -l ${ff} 2>/dev/null | grep -v "^.*~[0-9]\+~$"
+        fi
+      done
     done
   echo "<<<<< END ${script_name}"
   echo ""

From ae2633591e62a67229f74c6e6d59bf49e76d449a Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 01:02:12 -0700
Subject: [PATCH 16/28] Remove now obsolete sources/*.CM files; update README a
 bit

---
 scripts/README.md        | 22 +++++++++++++++++-----
 sources/LOADUP-APPS.CM   |  1 -
 sources/LOADUP-FULL.CM   |  1 -
 sources/LOADUP-INIT.LISP | 19 -------------------
 sources/LOADUP-LISP.CM   |  1 -
 sources/XREM.CM          |  6 ------
 6 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 sources/LOADUP-APPS.CM
 delete mode 100644 sources/LOADUP-FULL.CM
 delete mode 100644 sources/LOADUP-INIT.LISP
 delete mode 100644 sources/LOADUP-LISP.CM
 delete mode 100644 sources/XREM.CM

diff --git a/scripts/README.md b/scripts/README.md
index d4dd7da1..413d08e1 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -7,18 +7,30 @@ Loading from an old 'starter' sysout
 * loadup-mid-from-init.sh  -- phase 2 (creates init.sysout)
 * loadup-lisp-from-mid.sh  -- phase 3 (creates lisp.sysout)
 * loadup-full-from-lisp.sh -- phase 4 (creates full.sysout)
-* loadup-aux.sh            -- phase 5,(creates exports.all whereis.hash
+* loadup-apps-from-full.sh -- phase 5 (creates app.sysout, with notecards, rooms and clos; optional)
+* loadup-aux.sh            -- phase 6 (creates exports.all whereis.hash)
+* loadup-db-from-full.sh   -- phase 7 (makes unreleased 'fuller.sysout' and fuller.database)
 
-* loadup-full.sh  -- Phase 1-4 only
+All of these scripts read from and write to a directory specified by the env variable LOADUP_WORKDIR.
+LOADUP_WORKDIR defaults to /tmp/loadups-$$ (where $$ is the PID of the script). Note that all /tmp files
+are cleared after 10 days or upon system reboot. You can replicate the old work directory scheme 
+where files were never deleted automatically by simply setting LOADUP_WORKDIR to "./tmp"
 
-* loadup-db.sh    -- phase 6 (makes unreleased 'fuller.sysout' and fuller.database
-* copy-all.sh     -- copy loadups from tmp/ to loadups/ and library/
+* loadup-all.sh [-apps] -- Phases 1-4 & 6 (plus Phase 5 with -apps flag)
+* loadup-db.sh    -- phase 7 only based on full.syout in loadup directory
+
+These two scripts call the 7 scripts above as specified and then (if successful) copy (ln) the results
+to the loadups directory using a versioned copy.  The files are hardlinked into loadups from the workdir
+if workdir and loadups are on the same filesystem, otherwise they are copied. 
+
+* loadup-full.sh  -- Phases 1-4 only, no copy into loadups at the end.
 
 
 ## possibly handy scripts
 
 * lsee <lispfile>  -- show lisp file with font-control-characters rendered as linux color changes
-* cpv file1 file2  -- copies file1 to file2 (or directory name) adding versions
+* cpv file1 file2  -- hardlinks (or copies) file1 to file2 (or directory name) adding versions
+                      choice of hardlink or copy depends on whether the files are on the same filesystem.
 * restore-versions.sh -- pulls out old versions from git history and links in with medley versioning conventions
 
 ## Not useful anymore 
diff --git a/sources/LOADUP-APPS.CM b/sources/LOADUP-APPS.CM
deleted file mode 100644
index f8d37768..00000000
--- a/sources/LOADUP-APPS.CM
+++ /dev/null
@@ -1 +0,0 @@
-"

(PROGN
   (IL:MEDLEY-INIT-VARS 'IL:GREET)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE NOTECARDSDIR))(QUOTE |/system/NOTECARDS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
   (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
   (IL:LOAD 
       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
       'IL:SYSLOAD
   )
   (IL:HARDRESET)
)
SHH
(PROGN 
   (IL:ENDLOADUP)
   (CLOS::LOAD-CLOS)
   (IL:|Apps.LOADUP|)
   (IL:MAKESYS
       (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /apps.sysout)))
       :APPS)
)
(IL:LOGOUT T)

"
\ No newline at end of file
diff --git a/sources/LOADUP-FULL.CM b/sources/LOADUP-FULL.CM
deleted file mode 100644
index 8ebb9a67..00000000
--- a/sources/LOADUP-FULL.CM
+++ /dev/null
@@ -1 +0,0 @@
-"

(PROGN
  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
  (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
  (IL:HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.sysout))) :FULL))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/LOADUP-INIT.LISP b/sources/LOADUP-INIT.LISP
deleted file mode 100644
index 016338d7..00000000
--- a/sources/LOADUP-INIT.LISP
+++ /dev/null
@@ -1,19 +0,0 @@
-(* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
-
-(LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
-(CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
-(DRIBBLE "init.dribble")
-
-(UNADVISE)
-(ADVISE 'PAGEFULLFN '(RETURN))
-(ADVISE '(ERROR IN \DO-DEFINE-FILE-INFO) '(RETURN))
-(MOVD? 'NILL 'SETTEMPLATE)
-(DEFINEQ (RRE (LAMBDA (X Y) Y)))
-(MOVD? 'RRE 'READ-READER-ENVIRONMENT)
-
-(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
-(MAKEINITGREET)
-(DRIBBLE)
-(LOGOUT T)
-STOP
-
diff --git a/sources/LOADUP-LISP.CM b/sources/LOADUP-LISP.CM
deleted file mode 100644
index d08bdff7..00000000
--- a/sources/LOADUP-LISP.CM
+++ /dev/null
@@ -1 +0,0 @@
-"

(PROGN
  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
  (HARDRESET)
)
SHH
(PROGN
  (IL:ENDLOADUP)':MEDLEY)
  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout)))))
  (IL:LOGOUT T)
)

"
\ No newline at end of file
diff --git a/sources/XREM.CM b/sources/XREM.CM
deleted file mode 100644
index 1cd92bd7..00000000
--- a/sources/XREM.CM
+++ /dev/null
@@ -1,6 +0,0 @@
-"
-(MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))
-(MOVD? (QUOTE NILL) (QUOTE CURSORP))
-(MOVD? (QUOTE NILL) (QUOTE CHANGEBACKGROUNDBORDER))
-(LOGOUT)
-"

From 346c11b0ad446184c07ace1534067d6a97e24b78 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 13:41:36 -0700
Subject: [PATCH 17/28] WIP fixing up scripts/release_medley.sh and syncing
 with buildLoadup.yml

---
 .gitignore                   |  4 ++
 scripts/release-make-tars.sh | 86 ++++++++++++++++++++++++++++++++++++
 scripts/release-medley.sh    | 49 +++++---------------
 3 files changed, 101 insertions(+), 38 deletions(-)
 create mode 100755 scripts/release-make-tars.sh

diff --git a/.gitignore b/.gitignore
index aeae2bea..223b84a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 
 tmp/*
 
+# releases directory
+releases/*
+
+
 # all loadup files 
 
 loadups/exports.all
diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh
new file mode 100755
index 00000000..f62d9236
--- /dev/null
+++ b/scripts/release-make-tars.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+######### Functions ########
+check_exists () {
+  f="$1"
+  if [ -e "${f}" ]
+  then
+    echo "${f}"
+  else
+    echo "Warning: $f does not exist. $(basename ${f}) will not be included in release tars" 1>&2
+    echo " "
+  fi
+}
+######## End Functions #######
+
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+export MEDLEYDIR=`pwd`
+
+if [ -z "$1" ] ; then
+    tag=medley-$(date +%y%m%d)-$(date +%s)
+else
+    tag="$1"
+fi
+short_tag="${tag#medley-}"
+
+dirname=$(basename "${MEDLEYDIR}")
+if [ "${dirname}" = "medley" ]
+then
+  name_xform=" "
+else
+  uname | grep -q -i Linux
+  if [ $? -eq 0 ]
+  then
+    name_xform="--xform s/^${dirname}/medley/"
+  else
+    name_xform="-s /^${dirname}/medley/"
+  fi
+fi
+
+cd ..
+release_dir="${dirname}"/releases/"${short_tag}"
+mkdir -p "${release_dir}"
+
+echo making releases/${short_tag}/$tag-loadups.tgz
+
+
+tar -c -z -f "${release_dir}"/$tag-loadups.tgz                  \
+    ${name_xform}                                               \
+    "${dirname}"/loadups/lisp.sysout                            \
+    "${dirname}"/loadups/full.sysout                            \
+    $(check_exists "${dirname}/loadups/apps.sysout")            \
+    "${dirname}"/loadups/*.dribble                              \
+    "${dirname}"/loadups/whereis.hash                           \
+    "${dirname}"/loadups/exports.all                            \
+    $(check_exists "${dirname}/loadups/fuller.database")        ;
+
+echo making releases/${short_tag}/$tag-runtime.tgz
+
+tar -c -z -f "${release_dir}"/$tag-runtime.tgz                  \
+    --exclude "*~" --exclude "*#*"                              \
+    --exclude exports.all                                       \
+    ${name_xform}                                               \
+    "${dirname}"/clos                                           \
+    "${dirname}"/docs/dinfo                                     \
+    "${dirname}"/docs/man-page/medley.1.gz                      \
+    "${dirname}"/doctools                                       \
+    "${dirname}"/greetfiles                                     \
+    "${dirname}"/rooms                                          \
+    "${dirname}"/medley                                         \
+    "${dirname}"/run-medley                                     \
+    "${dirname}"/scripts                                        \
+    "${dirname}"/fonts/displayfonts                             \
+    "${dirname}"/fonts/altofonts                                \
+    "${dirname}"/fonts/adobe                                    \
+    "${dirname}"/fonts/postscriptfonts                          \
+    "${dirname}"/fonts/ipfonts                                  \
+    "${dirname}"/library                                        \
+    "${dirname}"/lispusers                                      \
+    "${dirname}"/sources                                        \
+    "${dirname}"/internal                                       ;
+
+echo "Done with release tars"
diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh
index a4fcf0df..3834d7e9 100755
--- a/scripts/release-medley.sh
+++ b/scripts/release-medley.sh
@@ -6,48 +6,21 @@ if [ ! -x run-medley ] ; then
     exit 1
 fi
 
-tag=$1
-
-if [ -z "$tag" ] ; then
-    tag=medley-`date +%y%m%d`
+if [ -z "$1" ] ; then
+    tag=medley-$(date +%y%m%d)-$(date +%s)
+else
+    tag="$1"
 fi
+short_tag="${tag#medley-}"
 
-cd ..
-
-echo making $tag-loadups.tgz
-
-tar cfz medley/tmp/$tag-loadups.tgz                       \
-    medley/loadups/lisp.sysout                            \
-    medley/loadups/full.sysout                            \
-    medley/loadups/fuller.database                        \
-    medley/loadups/*.dribble                              \
-    medley/loadups/whereis.hash                           \
-    medley/loadups//exports.all
-	
-echo making $tag-runtime.tgz
-
-tar cfz medley/tmp/$tag-runtime.tgz                       \
-    --exclude "*~" --exclude "*#*"                        \
-    medley/docs/dinfo                                     \
-    medley/doctools                                       \
-    medley/greetfiles                                     \
-    medley/rooms                                          \
-    medley/run-medley                                     \
-    medley/scripts                                        \
-    medley/fonts/displayfonts  medley/fonts/altofonts     \
-    medley/fonts/adobe                                    \
-    medley/fonts/postscriptfonts                          \
-    medley/library                                        \
-    medley/lispusers                                      \
-    medley/sources                                        \
-    medley/internal
-
-cd medley
+scripts/release-make-tars.sh "${tag}"
 
 echo making release
-sed s/'$tag'/$tag/g < release-notes.md > tmp/release-notes.md
-gh release create $tag -F tmp/release-notes.md -p -t $tag
+sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md
+gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag
 
 echo uploading
-gh release upload $tag tmp/$tag-loadups.tgz tmp/$tag-runtime.tgz --clobber
+gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber
+
+echo done
 

From 84391b367b4482ce45540e0c2921a00340874faf Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 16:43:35 -0700
Subject: [PATCH 18/28] First pass a complete new make-release.sh

---
 scripts/README.md         |  7 +++++++
 scripts/release-medley.sh | 22 ++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/scripts/README.md b/scripts/README.md
index 413d08e1..6430dfb0 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -25,6 +25,13 @@ if workdir and loadups are on the same filesystem, otherwise they are copied.
 
 * loadup-full.sh  -- Phases 1-4 only, no copy into loadups at the end.
 
+## releases
+
+* release-medley.sh --  will create Medley release tars and upload as a release on github.  
+                      Arguments: -d to make a draft release. <Tag> to uses as a tag for this 
+                      release on github (defaults to meldey-\<date>-\<seconds since epoch>).
+
+* release-make-tars.sh -- will create the Medley release tars and store them in the releases directory.
 
 ## possibly handy scripts
 
diff --git a/scripts/release-medley.sh b/scripts/release-medley.sh
index 3834d7e9..68f5f77f 100755
--- a/scripts/release-medley.sh
+++ b/scripts/release-medley.sh
@@ -6,6 +6,24 @@ if [ ! -x run-medley ] ; then
     exit 1
 fi
 
+if [ -z "$(which gh)" ]; then
+    echo "Error: this script requires gh (github cli) to be installed. Exiting."
+    exit 1
+fi
+
+gh auth status 2>&1 | grep -i -q "Logged in to github.com"
+if [ $? -ne 0 ]; then
+    echo 'Error: this script requires you to be logged into github.  Use "gh auth login" to do so. Exiting.'
+    exit 1
+fi
+
+if [ "$1" = "-d" ]; then
+    draft="-d"
+    shift
+else
+    draft=""
+fi
+
 if [ -z "$1" ] ; then
     tag=medley-$(date +%y%m%d)-$(date +%s)
 else
@@ -17,10 +35,10 @@ scripts/release-make-tars.sh "${tag}"
 
 echo making release
 sed s/'$tag'/$tag/g < release-notes.md > releases/${short_tag}/release-notes.md
-gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag
+gh release create $tag -F releases/${short_tag}/release-notes.md -p -t $tag ${draft}
 
 echo uploading
 gh release upload $tag releases/${short_tag}/$tag-loadups.tgz releases/${short_tag}/$tag-runtime.tgz --clobber
 
-echo done
+echo "Done with release ${tag}"
 

From dfce541a18676745291243360f37987a3c39b77b Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 16:47:04 -0700
Subject: [PATCH 19/28] Fix scripts/README.md

---
 scripts/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/README.md b/scripts/README.md
index 6430dfb0..f62e02bb 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -28,8 +28,9 @@ if workdir and loadups are on the same filesystem, otherwise they are copied.
 ## releases
 
 * release-medley.sh --  will create Medley release tars and upload as a release on github.  
-                      Arguments: -d to make a draft release. <Tag> to uses as a tag for this 
+                      Arguments: -d to make a draft release. \<Tag> to use as a tag for this 
                       release on github (defaults to meldey-\<date>-\<seconds since epoch>).
+                      Both are optional.
 
 * release-make-tars.sh -- will create the Medley release tars and store them in the releases directory.
 

From 1ff71ea15d4317dccaa9e9c1231e36f22a6a56d4 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 2 Aug 2023 22:03:38 -0700
Subject: [PATCH 20/28] update buildLOadup.yml to use new
 scripts/release-make-tars.sh instead of its almost but not quite equivalent
 make tars code

---
 .github/workflows/buildLoadup.yml | 41 +++----------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/buildLoadup.yml b/.github/workflows/buildLoadup.yml
index e3d5b618..54da1136 100644
--- a/.github/workflows/buildLoadup.yml
+++ b/.github/workflows/buildLoadup.yml
@@ -228,45 +228,10 @@ jobs:
           scripts/loadup-all.sh -apps
           scripts/loadup-db.sh
 
-      - name: Build loadups release tar
+      - name: Build release tars
         run: |
-          cd ..
-          mkdir -p medley/${TARBALL_DIR}
-          tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-loadups.tgz        \
-            medley/loadups/lisp.sysout               \
-            medley/loadups/full.sysout               \
-            medley/loadups/apps.sysout               \
-            medley/loadups/whereis.hash              \
-            medley/loadups/*.dribble                 \
-            medley/loadups/fuller.database           \
-            medley/loadups/exports.all
-
-      - name: Build runtime release tar
-        run: |
-          cd ..
-          mkdir -p medley/${TARBALL_DIR}
-          tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-runtime.tgz          \
-                     --exclude "*~" --exclude "*#*"              \
-                     --exclude exports.all                       \
-                     medley/clos                                 \
-                     medley/docs/dinfo                           \
-                     medley/docs/man-page/medley.1.gz            \
-                     medley/doctools                             \
-                     medley/greetfiles                           \
-                     medley/rooms                                \
-                     medley/medley                               \
-                     medley/run-medley                           \
-                     medley/scripts                              \
-                     medley/fonts/displayfonts                   \
-                     medley/fonts/altofonts                      \
-                     medley/fonts/adobe                          \
-                     medley/fonts/postscriptfonts                \
-                     medley/fonts/ipfonts                        \
-                     medley/library                              \
-                     medley/lispusers                            \
-                     medley/sources                              \
-                     medley/internal
-
+          scripts/release-make-tars.sh "${MEDLEY_RELEASE_TAG}"
+          mv releases/"${MEDLEY_SHORT_RELEASE_TAG}"/*.tgz "${TARBALL_DIR}"
 
       # Build the deb files as well as the tgz files
       - name: Build .deb files for 3 architectures

From 126a8cfb37e1aab43b5e061d3e324a476db25a5e Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Fri, 4 Aug 2023 15:07:43 -0700
Subject: [PATCH 21/28] Remove references to LOADUP_WORKDIR from all lisp code
 and instead pass the file references down from the callinf .CM files (which
 are now embedded in the loadup- scripts;  also add /unicode subdir to the
 release tars.

---
 internal/MEDLEY-UTILS          |  45 +++++++++++++-------------
 internal/MEDLEY-UTILS.LCOM     | Bin 7317 -> 6947 bytes
 scripts/loadup-aux.sh          |  11 +++++--
 scripts/loadup-db-from-full.sh |  15 ++++++---
 scripts/loadup-init.sh         |   5 ++-
 scripts/release-make-tars.sh   |   4 ++-
 sources/MAKEINIT               |  56 ++++++++++++++++-----------------
 sources/MAKEINIT.LCOM          | Bin 23621 -> 23471 bytes
 8 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index 47d52d5e..2e0ae0e2 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,11 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED " 1-Aug-2023 22:43:13" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|
 10714  
+
(FILECREATED " 3-Aug-2023 18:40:12" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;6|
 10695  
 
-      :CHANGES-TO (FNS MAKE-FULLER-DB)
+      :EDIT-BY "frank"
 
-      :PREVIOUS-DATE " 1-Aug-2023 22:22:02" 
-|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;4|)
+      :CHANGES-TO (FNS MAKE-FULLER-DB MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)
+
+      :PREVIOUS-DATE " 1-Aug-2023 22:43:13" 
+|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -101,21 +103,19 @@
         (HELP))))
 
 (MAKE-FULLER-DB

-  (LAMBDA NIL
                                             (* \; "Edited 16-Jul-2022 22:07 by larry")


+  (LAMBDA (DRIBBLEFILE DBFILE SYSOUTFILE)
                 (* \; "Edited  3-Aug-2023 18:12 by frank")


+                                                          (* \; "Edited 16-Jul-2022 22:07 by larry")


                                                           (* \; "Edited 20-Jun-2022 17:23 by larry")

     (FILESLOAD (SOURCE)
            FILESETS)
-    (DRIBBLE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                    "/" "fuller.dribble"))
+    (DRIBBLE (OR DRIBBLEFILE "fuller.dribble"))
     (DOFILESLOAD (SUBSET (APPEND OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
                         'FINDFILE))
     (GATHER-INFO
 'ALL)
     (MASTERSCOPE '(WHO CALLS XYZZY))
-    (DUMPDATABASE NIL (MKATOM (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                                     "/" "fuller.database")))
+    (DUMPDATABASE NIL (MKATOM (OR DBFILE "fuller.database")))
     (DRIBBLE)
-    (MAKESYS (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                    "/" "fuller.sysout")
+    (MAKESYS (OR SYSOUTFILE "fuller.sysout")
            "Welcome to Fuller sysout")))
 
 (MEDLEY-FIX-LINKS

@@ -148,7 +148,8 @@
 (DEFINEQ
 
 (MAKE-EXPORTS-ALL

-  (LAMBDA NIL
                                             (* \; "Edited  9-Mar-2021 16:11 by larry")

+  (LAMBDA (OUTFILE)
                                       (* \; "Edited  3-Aug-2023 18:34 by frank")


+                                                          (* \; "Edited  9-Mar-2021 16:11 by larry")

                                                              (* "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/.  Don't know why it does the CORE/RENAME")

                                                              (* 
 
          "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.")

@@ -158,27 +159,25 @@
 
                                                             "Edited September 29, 1986 by van Melle")

     (CNDIR (MEDLEYDIR "sources"))
     (LOAD 'FILESETS)
-    (GATHEREXPORTS EXPORTFILES (CONCAT '{DSK} (UNIX-GETENV "LOADUP_WORKDIR")
-                                      "/" "exports.all"))))
+    (GATHEREXPORTS EXPORTFILES (OR OUTFILE "exports.all"))))
 
 (MAKE-WHEREIS-HASH

-  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 12-Mar-2022 12:46 by rmk")


+  (LAMBDA (DRIBBLEFILE TMPFILE WHEREISFILE)
               (* \; "Edited  3-Aug-2023 18:37 by frank")


+                                                            (* \; "Edited 12-Mar-2022 12:46 by rmk")


                                                           (* \; "Edited 24-Mar-2021 13:26 by larry")

     (LET ((FILING.ENUMERATION.DEPTH 2)
           HASHFILE)
-         (DRIBBLE DRIBBLEFILE)
-         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                                                     "/" "whereis.hash-tmp")
+         (DRIBBLE (OR DRIBBLEFILE "whereis.dribble"))
+         (SETQ HASHFILE (XCL::WHERE-IS-NOTICE (OR TMPFILE "whereis.hash-tmp")
                                :FILES
                                (|for|
 X |in|
 MEDLEY-FIX-DIRS |collect|
 (CONCAT (MEDLEYDIR X)
                                                                               "*.;"))
                                :HASH-FILE-SIZE 60000 :NEW T))
-         (RENAMEFILE HASHFILE (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                                     "/" "whereis.hash"))
+         (RENAMEFILE HASHFILE (OR WHEREISFILE "whereis.hash"))
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (620 7662 (GATHER-INFO 630 . 6158) (MAKE-FULLER-DB 6160 . 7017) (MEDLEY-FIX-LINKS 7019
- . 7416) (MEDLEY-FIX-DATES 7418 . 7660)) (8701 10691 (MAKE-EXPORTS-ALL 8711 . 9739) (MAKE-WHEREIS-HASH
- 9741 . 10689)))))
+  (FILEMAP (NIL (679 7642 (GATHER-INFO 689 . 6217) (MAKE-FULLER-DB 6219 . 6997) (MEDLEY-FIX-LINKS 6999
+ . 7396) (MEDLEY-FIX-DATES 7398 . 7640)) (8681 10672 (MAKE-EXPORTS-ALL 8691 . 9752) (MAKE-WHEREIS-HASH
+ 9754 . 10670)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.LCOM b/internal/MEDLEY-UTILS.LCOM
index 4a353503f00571c86078e35bfd0c85c18b11ca6d..b492e029673249f348f9d10bbe5f8e361aba8011 100644
GIT binary patch
delta 978
zcmZvb-D=w~6vyMXbXzV;x{!X2Z3l1ArVwMv&WAk;Q(|Q?wc}vBq$#~gSFa7tnv$e!
zg|M<W=n%Uf>=DYIW;c6;u_u`1=A(o8LL40(>HPisOJ9xeg&RMu<;dkp4y#xLR5Eqd
z#KkXB{kky9f(&@Js3KFvrf$eE8ouqlzvylrk6_d}A3;*C?l}(JFIE(V*B!Tq5ik1B
zF?lR!lUr5Wp%tH!kXpRxA0dlE3Bs%-?Q9fy3#1l|Jebt7!(6!q^1FWf{7hz_Bw&Bm
zUd}<1eUqLuO|otm=8{X>Hed)^fwvcm9$*6kt2_=>uzb5*c4$0jOR1go&HO@QzL((N
zBQd=G@u0_sspd7|!8Dr`(L*tm$LV-2PNx!ENJrq3UCP@6;xNZe0HG3Cdv3!bAt{r9
z@`MKNE(tvs41;e8Lh1(<uR)<?z#9_QsGqazRS$|M23Vd@88{xXAg@8yu3NEeU5CR%
z(rD1Sg+Vj!PwuZ^Jk??F&Eu0e`jQUBad-eoD=_u(Q(r@z>SebZ^_9WZpm#Zx0jZ^F
zj(gcYY7ZhA3>~(bH4iHMfB^Pe2M4VzpyI5u-#I$!Mso6YJ^f31VS@@2AF4d2`wh>J
zZ3(iF$R?zO#8R0J5YPqO2~VvwhH<wcU{@J<hQ@zE!$4@)G?1f@7rp*)ptQSP_A|4;
zj-km3Qagw_3Fkw%A!4SkY(5z*N{RXI-14$C=@&aLjAox#Y&@}cX11^v%`hUh2tKV7
z_wM=_m?^6(oxBbeuU;V`aARC*IkaWjzMwL`1_C+1zjfM#ViC+532HeZDi_!X6f_mg
v*qzuA6@&cYH0np4fpXd&oXVgZAa5(L_(Nj9S2JlYXIgN4NBeer?QG#M@3`q*

delta 1370
zcmaJ=U279T6y2>wYb?_ABZ44a7R9EJxHJ3JO%dH>Cv8Zw8+Ny*m4c);Hl@*&Bt^wY
zeu9-n@m>4{eeuCxA^0x%6MPb1yu0~m8f*7q=g!Q%XYQPH=9BtfKXT?s!Z_SbP?1VN
zX-bw-RDM^rx=JSw0*r2wl%l7IC_tzEr19*aerKlxoxSHBhzLfh<icojGMU7@ol3ik
zNoT<*LOimV%@tV2VTQ-du_WsM;@KsL5K$wt|CWb|IQZZBn^V}LNCk-afA|$%KGr6#
zT=nZS_u}6!OmbX<!|!tN3!}59)Be|)a`*q+Lxe~WO$ER6lf&IGd4^l0q6S4H&)iKH
zh^|4#wlanXWSPRcmD@<HGLKmgp-WT^OedF47Z?zgg1KHSnTBVi4Hp*_1j!qoUBr+M
zF(mC22B8Fxay{m_8M}m4gutrdtuZH&v$8f2k$`Cj47&x}FhNrwo3qSd0d`dtwzg0-
zW|<UJGBQy{cVv0krKArUq4KFdbcF4nfr=7Q1*1^F2+&df@92%LPC<BjSg%)`$=0h@
z<FJi(Sk^$ei=&2P(A|3JaoKkAX3hx~vEa4o=HFl}V?w_e%~aX0w5mb`moX)%mvH>2
zo?^|Qo~XVtJC~B=6PV`S_IAB00M&aKIE+CA2Mi#NYqLN2YgrJ1ZIo=s3ojc7?mowJ
zoWDPR-QFE~WXyTf!N$NDs@PYj2jhaG3<#CQQ9}LC^N^NA2ycKU>e0(QH{eteL8!hw
zXf)fcWTjpgKvu#_NI0Cng#UAX!!Iw~TKagA=lJ?WG|E31>u+p2?SELv?VNA+lShGO
zC$c`Y2SKYi%rc5BG#ELt3mNkZzGy!hi*?nZp%fj8%q*}?lpm0c{-dGFC@tvc!C|4z
zL`Yez3}~*@n&GY`f@2eI?hy+pN%d4h!bqU}i(0i=-D@Rll~xT+6AGWe0LdL=Em#~%
i4=RRB$rS-4|0uR_8$}6BN5#k)Whg+X*zuRx{^VakX)B!o

diff --git a/scripts/loadup-aux.sh b/scripts/loadup-aux.sh
index 4a48f779..598f6955 100755
--- a/scripts/loadup-aux.sh
+++ b/scripts/loadup-aux.sh
@@ -11,11 +11,18 @@ loadup_start
 
 cat >"${cmfile}" <<"EOF"
 "
+(PROG
+  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /))))
   (IL:MEDLEY-INIT-VARS)
   (IL:LOAD(QUOTE MEDLEY-UTILS))
-  (IL:MAKE-EXPORTS-ALL)
-  (IL:MAKE-WHEREIS-HASH (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /whereis.dribble))))
+  (IL:MAKE-EXPORTS-ALL (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE exports.all))))
+  (IL:MAKE-WHEREIS-HASH
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.dribble)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash-tmp)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE whereis.hash)))
+  )
   (IL:LOGOUT T)
+)
 "
 EOF
 
diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh
index c972491a..8b368d50 100755
--- a/scripts/loadup-db-from-full.sh
+++ b/scripts/loadup-db-from-full.sh
@@ -12,10 +12,17 @@ loadup_start
 cat >"${cmfile}" <<"EOF"
 "
 
-(IL:MEDLEY-INIT-VARS)
-(IL:FILESLOAD MEDLEY-UTILS)
-(IL:MAKE-FULLER-DB)
-(IL:LOGOUT T)
+(PROG
+  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /))))
+  (IL:MEDLEY-INIT-VARS)
+  (IL:FILESLOAD MEDLEY-UTILS)
+  (IL:MAKE-FULLER-DB
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.sysout)))
+  )
+  (IL:LOGOUT T)
+)
 
 "
 EOF
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index e08f8ad5..ce1d5686 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -24,7 +24,10 @@ cat >"${cmfile}" <<"EOF"
 (MOVD? 'RRE 'READ-READER-ENVIRONMENT)
 
 (LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
-(MAKEINITGREET)
+(PROG
+  ((WORKDIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") "/")))
+  (MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit"))
+)
 (DRIBBLE)
 (LOGOUT T)
 STOP
diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh
index f62d9236..69fae765 100755
--- a/scripts/release-make-tars.sh
+++ b/scripts/release-make-tars.sh
@@ -81,6 +81,8 @@ tar -c -z -f "${release_dir}"/$tag-runtime.tgz                  \
     "${dirname}"/library                                        \
     "${dirname}"/lispusers                                      \
     "${dirname}"/sources                                        \
-    "${dirname}"/internal                                       ;
+    "${dirname}"/internal                                       \
+    "${dirname}"/unicode                                        ;
+
 
 echo "Done with release tars"
diff --git a/sources/MAKEINIT b/sources/MAKEINIT
index b1cd3577..f4f13448 100644
--- a/sources/MAKEINIT
+++ b/sources/MAKEINIT
@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "30-Jul-2023 23:39:21" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;4
 54459  
+
(FILECREATED " 3-Aug-2023 17:37:51" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;7
 54420  
+
+      :EDIT-BY "frank"
 
       :CHANGES-TO (FNS MAKEINITGREET)
 
-      :PREVIOUS-DATE "11-Jul-2022 20:00:23" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;1)
+      :PREVIOUS-DATE "30-Jul-2023 23:39:21" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;6)
 
 
 (PRETTYCOMPRINT MAKEINITCOMS)
@@ -77,7 +79,8 @@
 (DEFINEQ
 
 (MAKEINITGREET

-  [LAMBDA NIL
                                              (* ; "Edited 11-Mar-2021 22:14 by larry")


+  [LAMBDA (SYSOUTFILE DLINITFILE)
                          (* ; "Edited  3-Aug-2023 17:37 by frank")


+                                                           (* ; "Edited 11-Mar-2021 22:14 by larry")


                                                             (* ; "Edited  5-Dec-2017 15:26 by rmk:")

 
     (* ;; "")

@@ -90,11 +93,8 @@
     (DORENAME 'I)
     (DORENAME 'R)
     (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
-                      (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                             "/init.sysout")
-                      NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
-           (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR")
-                  "/init.dlinit"])
+                      SYSOUTFILE NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
+           DLINITFILE])
 )
 
 (FILESLOAD (SOURCE)
@@ -1050,25 +1050,25 @@ DONTCOPY
        FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3843 4691 (MAKEINITGREET 3853 . 4689)) (4874 11259 (LOADMAKEINIT 4884 . 6087) (
-LOADMKIFILES 6089 . 6404) (RELOAD 6406 . 6889) (MAKEINIT 6891 . 10551) (MKI.START 10553 . 11257)) (
-11337 17055 (MKI.PASSFILE 11347 . 14957) (SCRATCHARRAY 14959 . 15608) (DOFORM 15610 . 16287) (
-CONSTFORMP 16289 . 16523) (NOTICECOMS 16525 . 16833) (EVALFORMAKEINIT 16835 . 17053)) (17056 19176 (
-I.ADDTOVAR 17066 . 17160) (I.DECLARE%: 17162 . 17438) (I.DEFINE-FILE-INFO 17440 . 17630) (
-I.FILECREATED 17632 . 18006) (I.PUTPROPS 18008 . 18121) (I.RPAQ 18123 . 18344) (I.RPAQQ 18346 . 18542)
- (I.RPAQ? 18544 . 18759) (I.SETTOPVAL 18761 . 18993) (I.NOUNDO 18995 . 19174)) (19812 26028 (
-I.ATOMNUMBER 19822 . 20313) (I.\ATOMCELL 20315 . 22068) (I.FIXUPNUM 22070 . 22995) (I.FIXUPPTR 22997
- . 23478) (I.FIXUPSYM 23480 . 24536) (I.WORDSPERNAMEENTRY 24538 . 25293) (I.SETSTKNTOFFSET 25295 . 
-26026)) (26060 27568 (MKI.ATOM 26070 . 26266) (MKI.IEEE 26268 . 27566)) (27665 28430 (MKI.DSET 27675
- . 27958) (MKI.ADDTO 27960 . 28145) (MKI.PUTPROP 28147 . 28428)) (28604 29156 (DUMPVP 28614 . 28711) (
-BOUTZEROS 28713 . 28792) (BIN16 28794 . 28975) (BOUT16 28977 . 29154)) (30047 52781 (DLFIXINIT 30057
- . 31032) (DLSORTSYSOUTPAGES 31034 . 36160) (DLNEXTFP 36162 . 36499) (DLLOCKEDPAGEP 36501 . 36715) (
-DLSETLOCKBIT 36717 . 36979) (DLCOPYPAGEMAP 36981 . 40032) (DLCOPYVMPAGE 40034 . 40424) (
-DLADDPAGEMAPENTRIES 40426 . 41241) (ASSIGNFILEPAGE 41243 . 42476) (ASSIGNFILEPAGERANGE 42478 . 42885) 
-(DLDUMPSYSOUT 42887 . 44639) (DLDUMPFPTOVP 44641 . 45680) (DLDUMPPAGEMAPS 45682 . 46382) (
-DLDUMPVMEMPAGES 46384 . 47040) (DLSETBOOTPTR 47042 . 47272) (DLDUMPARRAY 47274 . 47661) (
-DLMARKASDUMPED 47663 . 48116) (DLDUMPVMEMPAGE 48118 . 48806) (INSTALLDOMINO 48808 . 49455) (
-INSTALLDOMINO.DIRECT 49457 . 50609) (INSTALLNEWDOMINO 50611 . 52779)) (52803 54160 (DLPRINTFPTOVP 
-52813 . 53102) (PRINTPRIMARYMAP 53104 . 53818) (DLREADPAGEOFWORDS 53820 . 53987) (SETDIF 53989 . 54158
+  (FILEMAP (NIL (3867 4652 (MAKEINITGREET 3877 . 4650)) (4835 11220 (LOADMAKEINIT 4845 . 6048) (
+LOADMKIFILES 6050 . 6365) (RELOAD 6367 . 6850) (MAKEINIT 6852 . 10512) (MKI.START 10514 . 11218)) (
+11298 17016 (MKI.PASSFILE 11308 . 14918) (SCRATCHARRAY 14920 . 15569) (DOFORM 15571 . 16248) (
+CONSTFORMP 16250 . 16484) (NOTICECOMS 16486 . 16794) (EVALFORMAKEINIT 16796 . 17014)) (17017 19137 (
+I.ADDTOVAR 17027 . 17121) (I.DECLARE%: 17123 . 17399) (I.DEFINE-FILE-INFO 17401 . 17591) (
+I.FILECREATED 17593 . 17967) (I.PUTPROPS 17969 . 18082) (I.RPAQ 18084 . 18305) (I.RPAQQ 18307 . 18503)
+ (I.RPAQ? 18505 . 18720) (I.SETTOPVAL 18722 . 18954) (I.NOUNDO 18956 . 19135)) (19773 25989 (
+I.ATOMNUMBER 19783 . 20274) (I.\ATOMCELL 20276 . 22029) (I.FIXUPNUM 22031 . 22956) (I.FIXUPPTR 22958
+ . 23439) (I.FIXUPSYM 23441 . 24497) (I.WORDSPERNAMEENTRY 24499 . 25254) (I.SETSTKNTOFFSET 25256 . 
+25987)) (26021 27529 (MKI.ATOM 26031 . 26227) (MKI.IEEE 26229 . 27527)) (27626 28391 (MKI.DSET 27636
+ . 27919) (MKI.ADDTO 27921 . 28106) (MKI.PUTPROP 28108 . 28389)) (28565 29117 (DUMPVP 28575 . 28672) (
+BOUTZEROS 28674 . 28753) (BIN16 28755 . 28936) (BOUT16 28938 . 29115)) (30008 52742 (DLFIXINIT 30018
+ . 30993) (DLSORTSYSOUTPAGES 30995 . 36121) (DLNEXTFP 36123 . 36460) (DLLOCKEDPAGEP 36462 . 36676) (
+DLSETLOCKBIT 36678 . 36940) (DLCOPYPAGEMAP 36942 . 39993) (DLCOPYVMPAGE 39995 . 40385) (
+DLADDPAGEMAPENTRIES 40387 . 41202) (ASSIGNFILEPAGE 41204 . 42437) (ASSIGNFILEPAGERANGE 42439 . 42846) 
+(DLDUMPSYSOUT 42848 . 44600) (DLDUMPFPTOVP 44602 . 45641) (DLDUMPPAGEMAPS 45643 . 46343) (
+DLDUMPVMEMPAGES 46345 . 47001) (DLSETBOOTPTR 47003 . 47233) (DLDUMPARRAY 47235 . 47622) (
+DLMARKASDUMPED 47624 . 48077) (DLDUMPVMEMPAGE 48079 . 48767) (INSTALLDOMINO 48769 . 49416) (
+INSTALLDOMINO.DIRECT 49418 . 50570) (INSTALLNEWDOMINO 50572 . 52740)) (52764 54121 (DLPRINTFPTOVP 
+52774 . 53063) (PRINTPRIMARYMAP 53065 . 53779) (DLREADPAGEOFWORDS 53781 . 53948) (SETDIF 53950 . 54119
 )))))
 STOP
diff --git a/sources/MAKEINIT.LCOM b/sources/MAKEINIT.LCOM
index 3af36c6cc762407e7110b8077c0296917c5dad86..2a2c0084cb2ad6a9865cfe9dba267d11dbda2ec3 100644
GIT binary patch
delta 505
zcmZutO-md>5S`gI5C?<=1Vcc0%*EZqE?wO{J3D<4$DLl&$r@#Lmgr4!jf&r*ASeWK
z@T}|)@h}Jd13BiFbB_5P>DEXhqz+ZDx?c5r-QVv0+dKdI(<DSAJ=<z<#sw%=k}1h=
zcHe!8>j=UB&KN1il}tjMZXE6(?ad6abATZ14thQOOKdiqA%^Rxo5TNI5b>}c)Vijp
zJGo8^omtXz2O?Gxg(L2_-o}We<P3q*nJF6cs|Y`ztRL)#7#;g;Qn1GRv%N>_Tquz!
zPB$0rxK$4p(+}EwG{r)$bpe&NgPH*$>$yXx4g-e%YJX|)*ml82ug9kbb$HVAy~<0^
z#+FOt&(Wc4=eE~eS)O>|N*cKQ%B#u5Ds;_?6M+<XaxwZ*X-<n4GL!30v6LI#2PMdn
zz}VjaPs*>=pHw9#%Z+GuY>HTnWpJd7Sj!@MKv8+0T#i{*yNqXlRjNd+M0!=3A(ECP
W9f^cR!oKd$I`OA<qVjv^{LOEY3~*oo

delta 605
zcmZ{hL2J}N6vs2Mf{h3wiuLxGOS^}SlQ)x1vY;4}td6@TA)DHI($W;WblVlWg_bIU
z2M?Ys`2_t0iaF>P@aVxW;L(%cK_`J-tLPlw`@i>o|2GWt?j!m9iM(AaKaeXr=O;V&
zwnYmlV*CEVxQz@spw$(uYa@l}=4AKTc)5Vl9vIY5(;=J%P1B@MY)rR`e=cxo%UJ2j
zK@?<>pGRT&o-CD|*oy*eA#4wf@)coMEo*i)0<tb+UF0XnF0sm=<l4&~FbL%^9r%xW
zNt}l=i-J7KWHfAnR%k@iE@<jJt;6D<YEqZKLo;p4i}hgpNgdNm=j-%eDl_WwWo^ZC
zARP4Mx{PHG9zu}BfuDnmuo}zt_T4Ct;)l?2;DO(d8pswiNQkpgd8(Uwhm~LT8(Xde
z^yX-9G&PHHohUe}Gf4b!HGRC6WPSBs)kC1i;jsULg79XB{iFTKfiiH_`P;z7+<=}@
z{m{Qz=a8}Li@3dT9T|rd5PYV7TPdqiRz<z%3yKoe>8<a&5}oSJo!9y@T1-Krfjp%+
P$hqB}+nve@4wrrb5JiW&


From ed6a6e4e04f9de7f4429759617ab9ba1d4a74016 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 7 Aug 2023 12:34:11 -0700
Subject: [PATCH 22/28] move all loadups-related source files into
 internal/loadups; adjust scripts accordingly; move venuesysouts from loadups
 into internal/venuesysouts; fix issues in .CM files to allow starting
 loadups-all from any lisp/full.sysout

---
 {sources => internal/loadups}/LOADUP-APPS     |   0
 .../loadups}/LOADUP-APPS.LCOM                 | Bin
 {sources => internal/loadups}/LOADUP-FULL     |   0
 .../loadups}/LOADUP-FULL.LCOM                 | Bin
 {sources => internal/loadups}/LOADUP-LISP     |   0
 .../loadups}/LOADUP-LISP.LCOM                 | Bin
 {sources => internal/loadups}/MAKEINIT        |   0
 {sources => internal/loadups}/MAKEINIT.LCOM   | Bin
 {loadups => internal/loadups}/README.md       |   0
 {loadups => internal/loadups}/starter.sysout  | Bin
 .../venuesysouts}/full.venuesysout            | Bin
 .../venuesysouts}/lisp.venuesysout            | Bin
 scripts/copy-all.sh                           |  27 ++++++-------
 scripts/copy-db.sh                            |   4 +-
 scripts/loadup-apps-from-full.sh              |   6 +--
 scripts/loadup-db.sh                          |  36 ++++++++++++++++++
 scripts/loadup-full-from-lisp.sh              |   2 +-
 scripts/loadup-init.sh                        |  15 ++++++--
 scripts/loadup-lisp-from-mid.sh               |   8 ++--
 scripts/loadup-setup.sh                       |  10 +++++
 20 files changed, 79 insertions(+), 29 deletions(-)
 rename {sources => internal/loadups}/LOADUP-APPS (100%)
 rename {sources => internal/loadups}/LOADUP-APPS.LCOM (100%)
 rename {sources => internal/loadups}/LOADUP-FULL (100%)
 rename {sources => internal/loadups}/LOADUP-FULL.LCOM (100%)
 rename {sources => internal/loadups}/LOADUP-LISP (100%)
 rename {sources => internal/loadups}/LOADUP-LISP.LCOM (100%)
 rename {sources => internal/loadups}/MAKEINIT (100%)
 rename {sources => internal/loadups}/MAKEINIT.LCOM (100%)
 rename {loadups => internal/loadups}/README.md (100%)
 rename {loadups => internal/loadups}/starter.sysout (100%)
 rename {loadups => internal/venuesysouts}/full.venuesysout (100%)
 rename {loadups => internal/venuesysouts}/lisp.venuesysout (100%)

diff --git a/sources/LOADUP-APPS b/internal/loadups/LOADUP-APPS
similarity index 100%
rename from sources/LOADUP-APPS
rename to internal/loadups/LOADUP-APPS
diff --git a/sources/LOADUP-APPS.LCOM b/internal/loadups/LOADUP-APPS.LCOM
similarity index 100%
rename from sources/LOADUP-APPS.LCOM
rename to internal/loadups/LOADUP-APPS.LCOM
diff --git a/sources/LOADUP-FULL b/internal/loadups/LOADUP-FULL
similarity index 100%
rename from sources/LOADUP-FULL
rename to internal/loadups/LOADUP-FULL
diff --git a/sources/LOADUP-FULL.LCOM b/internal/loadups/LOADUP-FULL.LCOM
similarity index 100%
rename from sources/LOADUP-FULL.LCOM
rename to internal/loadups/LOADUP-FULL.LCOM
diff --git a/sources/LOADUP-LISP b/internal/loadups/LOADUP-LISP
similarity index 100%
rename from sources/LOADUP-LISP
rename to internal/loadups/LOADUP-LISP
diff --git a/sources/LOADUP-LISP.LCOM b/internal/loadups/LOADUP-LISP.LCOM
similarity index 100%
rename from sources/LOADUP-LISP.LCOM
rename to internal/loadups/LOADUP-LISP.LCOM
diff --git a/sources/MAKEINIT b/internal/loadups/MAKEINIT
similarity index 100%
rename from sources/MAKEINIT
rename to internal/loadups/MAKEINIT
diff --git a/sources/MAKEINIT.LCOM b/internal/loadups/MAKEINIT.LCOM
similarity index 100%
rename from sources/MAKEINIT.LCOM
rename to internal/loadups/MAKEINIT.LCOM
diff --git a/loadups/README.md b/internal/loadups/README.md
similarity index 100%
rename from loadups/README.md
rename to internal/loadups/README.md
diff --git a/loadups/starter.sysout b/internal/loadups/starter.sysout
similarity index 100%
rename from loadups/starter.sysout
rename to internal/loadups/starter.sysout
diff --git a/loadups/full.venuesysout b/internal/venuesysouts/full.venuesysout
similarity index 100%
rename from loadups/full.venuesysout
rename to internal/venuesysouts/full.venuesysout
diff --git a/loadups/lisp.venuesysout b/internal/venuesysouts/lisp.venuesysout
similarity index 100%
rename from loadups/lisp.venuesysout
rename to internal/venuesysouts/lisp.venuesysout
diff --git a/scripts/copy-all.sh b/scripts/copy-all.sh
index 339dde4a..f04a5e7f 100755
--- a/scripts/copy-all.sh
+++ b/scripts/copy-all.sh
@@ -9,27 +9,22 @@ fi
 
 echo ">>>>> START ${script_name}"
 
-# was
-# cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
-# cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
-# just copy the files that are released
-
-./scripts/cpv "${LOADUP_WORKDIR}"/full.sysout loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/full.sysout "${LOADUP_OUTDIR}"  | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.sysout "${LOADUP_OUTDIR}"  | sed -e "s#${MEDLEYDIR}/##g"
 if [ "${1}" = "-apps" ]; then
-    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout loadups
+    ./scripts/cpv "${LOADUP_WORKDIR}"/apps.sysout "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 fi
 
-./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/exports.all loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.hash "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/exports.all "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 
-./scripts/cpv "${LOADUP_WORKDIR}"/init.dribble loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/lisp.dribble loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/full.dribble loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/whereis.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/init.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/lisp.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/full.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/whereis.dribble "${LOADUP_OUTDIR}" | sed -e "s#${MEDLEYDIR}/##g"
 
-./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library
-./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS library | sed -e "s#${MEDLEYDIR}/##g"
+./scripts/cpv "${LOADUP_WORKDIR}"/RDSYS.LCOM library | sed -e "s#${MEDLEYDIR}/##g"
 
 echo "<<<<< END ${script_name}"
 echo ""
diff --git a/scripts/copy-db.sh b/scripts/copy-db.sh
index 4c22b420..77a76b92 100755
--- a/scripts/copy-db.sh
+++ b/scripts/copy-db.sh
@@ -9,8 +9,8 @@ fi
 
 echo ">>>>> START ${script_name}"
 
-./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database loadups
-./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble loadups
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.database "${LOADUP_OUTDIR}"
+./scripts/cpv "${LOADUP_WORKDIR}"/fuller.dribble "${LOADUP_OUTDIR}"
 
 echo "<<<<< END ${script_name}"
 echo ""
diff --git a/scripts/loadup-apps-from-full.sh b/scripts/loadup-apps-from-full.sh
index c4ba2e47..86a59d47 100755
--- a/scripts/loadup-apps-from-full.sh
+++ b/scripts/loadup-apps-from-full.sh
@@ -32,14 +32,14 @@ cat >"${cmfile}" <<"EOF"
    (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE ROOMSDIR))(QUOTE /ROOMS)) 'IL:SYSLOAD)
    (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE CLOSDIR))(QUOTE /DEFSYS.DFASL)) 'IL:SYSLOAD)
    (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |lispusers/BUTTONS.LCOM|)) 'IL:SYSLOAD)
-   (IL:LOAD 
-       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE |/sources/LOADUP-APPS.LCOM|))
+   (IL:LOAD
+       (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-APPS.LCOM))
        'IL:SYSLOAD
    )
    (IL:HARDRESET)
 )
 SHH
-(PROGN 
+(PROGN
    (IL:ENDLOADUP)
    (CLOS::LOAD-CLOS)
    (IL:|Apps.LOADUP|)
diff --git a/scripts/loadup-db.sh b/scripts/loadup-db.sh
index d0f89f7a..ebd7841e 100755
--- a/scripts/loadup-db.sh
+++ b/scripts/loadup-db.sh
@@ -7,6 +7,42 @@ fi
 
 . scripts/loadup-setup.sh
 
+loadup_start
+
+cat >"${cmfile}" <<"EOF"
+"
+
+(PROG
+  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /)))
+   (LOADUP-SOURCE-DIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /)))
+  )
+  (IL:MEDLEY-INIT-VARS)
+  (IL:FILESLOAD MEDLEY-UTILS)
+  (SETQ IL:DIRECTORIES (CONS LOADUP-SOURCE-DIR IL:DIRECTORIES))
+  (IL:MAKE-FULLER-DB
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database)))
+    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.sysout)))
+  )
+  (IL:LOGOUT T)
+)
+
+"
+EOF
+
+./run-medley ${scr} -loadup "${cmfile}" -full
+
+loadup_finish "fuller.database" "fuller*"
+
+#!/bin/sh
+
+if [ ! -x run-medley ] ; then
+    echo run from MEDLEYDIR
+    exit 1
+fi
+
+. scripts/loadup-setup.sh
+
 ./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh
 
 if [ $? -eq 0 ];
diff --git a/scripts/loadup-full-from-lisp.sh b/scripts/loadup-full-from-lisp.sh
index 6c027ec4..638e839b 100755
--- a/scripts/loadup-full-from-lisp.sh
+++ b/scripts/loadup-full-from-lisp.sh
@@ -13,7 +13,7 @@ cat >"${cmfile}" <<"EOF"
 "
 
 (PROGN
-  (IL:LOAD(IL:CONCAT(QUOTE {DSK})(IL:UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-FULL.LCOM)))
+  (IL:LOAD (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR))(QUOTE /LOADUP-FULL.LCOM)))
   (IL:LOADUP-FULL (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /full.dribble))))
   (IL:HARDRESET)
 )
diff --git a/scripts/loadup-init.sh b/scripts/loadup-init.sh
index ce1d5686..5db49820 100755
--- a/scripts/loadup-init.sh
+++ b/scripts/loadup-init.sh
@@ -12,7 +12,9 @@ loadup_start
 cat >"${cmfile}" <<"EOF"
 (* "make init files; this file is loaded as a 'greet' file by scripts/loadup-init.sh")
 
+(SETQ MEDLEYDIR NIL)
 (LOAD (CONCAT (UNIX-GETENV "MEDLEYDIR") "/sources/MEDLEYDIR.LCOM"))
+(MEDLEY-INIT-VARS)
 (CNDIR (UNIX-GETENV "LOADUP_WORKDIR"))
 (DRIBBLE "init.dribble")
 
@@ -23,16 +25,21 @@ cat >"${cmfile}" <<"EOF"
 (DEFINEQ (RRE (LAMBDA (X Y) Y)))
 (MOVD? 'RRE 'READ-READER-ENVIRONMENT)
 
-(LOAD (MEDLEYDIR "sources" "MAKEINIT.LCOM"))
+(LOAD (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_SOURCEDIR") "/" "MAKEINIT.LCOM"))
 (PROG
-  ((WORKDIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") "/")))
-  (MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit"))
+  ((WORKDIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_WORKDIR") "/"))
+   (LOADUP-SOURCE-DIR (CONCAT "{DSK}" (UNIX-GETENV "LOADUP_SOURCEDIR") "/"))
+  )
+  (SETQ DIRECTORIES (CONS LOADUP-SOURCE-DIR DIRECTORIES))
+  (RESETLST (RESETSAVE OK.TO.MODIFY.FNS T)
+    (MAKEINITGREET (CONCAT WORKDIR "init.sysout") (CONCAT WORKDIR "init.dlinit"))
+  )
 )
 (DRIBBLE)
 (LOGOUT T)
 STOP
 EOF
 
-./run-medley $scr -loadup "${cmfile}" loadups/starter.sysout
+./run-medley $scr -loadup "${cmfile}" "${LOADUP_SOURCEDIR}"/starter.sysout
 
 loadup_finish "init.dlinit" "init.*" "RDSYS*" "I-NEW*"
diff --git a/scripts/loadup-lisp-from-mid.sh b/scripts/loadup-lisp-from-mid.sh
index 7233f85b..6888da26 100755
--- a/scripts/loadup-lisp-from-mid.sh
+++ b/scripts/loadup-lisp-from-mid.sh
@@ -13,14 +13,16 @@ cat >"${cmfile}" <<"EOF"
 "
 
 (PROGN
-  (LOAD(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE MEDLEYDIR))(QUOTE /sources/LOADUP-LISP.LCOM)))
-  (LOADUP-LISP(CONCAT(QUOTE {DSK})(UNIX-GETENV(QUOTE LOADUP_WORKDIR))(QUOTE /lisp.dribble)))
+  (LOAD (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE MEDLEYDIR)) (QUOTE /sources/MEDLEYDIR.LCOM)))
+  (MEDLEY-INIT-VARS)
+  (LOAD (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /LOADUP-LISP.LCOM)))
+  (LOADUP-LISP (CONCAT (QUOTE {DSK}) (UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /lisp.dribble)))
   (HARDRESET)
 )
 SHH
 (PROGN
   (IL:ENDLOADUP)
-  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK})(IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR))(IL:L-CASE (QUOTE /lisp.sysout))) :LISP)
+  (IL:MAKESYS (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV(QUOTE LOADUP_WORKDIR)) (IL:L-CASE (QUOTE /lisp.sysout))) :LISP)
   (IL:LOGOUT T)
 )
 
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index d838dca4..c94e73b7 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -6,6 +6,16 @@ then
   export LOADUP_WORKDIR=/tmp/loadups-$$
 fi
 
+if [ -z "${LOADUP_SOURCEDIR}" ];
+then
+  export LOADUP_SOURCEDIR="${MEDLEYDIR}"/internal/loadups
+fi
+
+if [ -z "${LOADUP_OUTDIR}" ];
+then
+  export LOADUP_OUTDIR="${MEDLEYDIR}"/loadups
+fi
+
 mkdir -p "${LOADUP_WORKDIR}"
 
 scr="-sc 1024x768 -g 1042x790"

From 62422cd4ce3533c896220ecaf4eaf54514fcdbbe Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 7 Aug 2023 13:35:25 -0700
Subject: [PATCH 23/28] Add changes from PR#1307 (@masinter). Can't easily
 merge PR#1307 in directly because MAKEINIT has moved.  These changes set
 OK.TO.MODIFYFNS to T for all loadups to prevent loadups asking if its OK to
 modify system functions

---
 internal/loadups/MAKEINIT      |  59 +++++++++++++++++----------------
 internal/loadups/MAKEINIT.LCOM | Bin 23471 -> 23879 bytes
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/internal/loadups/MAKEINIT b/internal/loadups/MAKEINIT
index f4f13448..cae408c3 100644
--- a/internal/loadups/MAKEINIT
+++ b/internal/loadups/MAKEINIT
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 3-Aug-2023 17:37:51" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;7
 54420  
-
-      :EDIT-BY "frank"
+
(FILECREATED " 7-Aug-2023 13:31:49" {DSK}<home>frank>il>medley>gmedley>internal>loadups>MAKEINIT.;4
 54490  
 
       :CHANGES-TO (FNS MAKEINITGREET)
 
-      :PREVIOUS-DATE "30-Jul-2023 23:39:21" {DSK}<home>frank>il>medley>gmedley>sources>MAKEINIT.;6)
+      :PREVIOUS-DATE " 3-Aug-2023 17:37:51" 
+{DSK}<home>frank>il>medley>gmedley>internal>loadups>MAKEINIT.;1)
 
 
 (PRETTYCOMPRINT MAKEINITCOMS)
@@ -90,11 +89,13 @@
     (* ;; "")

                                                              (* Versions are Lisp Microcode Bcpl)

     (MEDLEY-INIT-VARS)
-    (DORENAME 'I)
-    (DORENAME 'R)
-    (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
-                      SYSOUTFILE NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
-           DLINITFILE])
+    (RESETLST
+        (RESETSAVE OK.TO.MODIFY.FNS T)
+        (DORENAME 'I)
+        (DORENAME 'R)
+        (DLFIXINIT
 (MAKEINIT
 '(39424 5682 11008)
+                          SYSOUTFILE NIL DIRECTORIES DISPLAYFONTDIRECTORIES)
+               DLINITFILE))])
 )
 
 (FILESLOAD (SOURCE)
@@ -1050,25 +1051,25 @@ DONTCOPY
        FPTOVP NEWFPFROMOLD VMEMFILE VMEMFILEX)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3867 4652 (MAKEINITGREET 3877 . 4650)) (4835 11220 (LOADMAKEINIT 4845 . 6048) (
-LOADMKIFILES 6050 . 6365) (RELOAD 6367 . 6850) (MAKEINIT 6852 . 10512) (MKI.START 10514 . 11218)) (
-11298 17016 (MKI.PASSFILE 11308 . 14918) (SCRATCHARRAY 14920 . 15569) (DOFORM 15571 . 16248) (
-CONSTFORMP 16250 . 16484) (NOTICECOMS 16486 . 16794) (EVALFORMAKEINIT 16796 . 17014)) (17017 19137 (
-I.ADDTOVAR 17027 . 17121) (I.DECLARE%: 17123 . 17399) (I.DEFINE-FILE-INFO 17401 . 17591) (
-I.FILECREATED 17593 . 17967) (I.PUTPROPS 17969 . 18082) (I.RPAQ 18084 . 18305) (I.RPAQQ 18307 . 18503)
- (I.RPAQ? 18505 . 18720) (I.SETTOPVAL 18722 . 18954) (I.NOUNDO 18956 . 19135)) (19773 25989 (
-I.ATOMNUMBER 19783 . 20274) (I.\ATOMCELL 20276 . 22029) (I.FIXUPNUM 22031 . 22956) (I.FIXUPPTR 22958
- . 23439) (I.FIXUPSYM 23441 . 24497) (I.WORDSPERNAMEENTRY 24499 . 25254) (I.SETSTKNTOFFSET 25256 . 
-25987)) (26021 27529 (MKI.ATOM 26031 . 26227) (MKI.IEEE 26229 . 27527)) (27626 28391 (MKI.DSET 27636
- . 27919) (MKI.ADDTO 27921 . 28106) (MKI.PUTPROP 28108 . 28389)) (28565 29117 (DUMPVP 28575 . 28672) (
-BOUTZEROS 28674 . 28753) (BIN16 28755 . 28936) (BOUT16 28938 . 29115)) (30008 52742 (DLFIXINIT 30018
- . 30993) (DLSORTSYSOUTPAGES 30995 . 36121) (DLNEXTFP 36123 . 36460) (DLLOCKEDPAGEP 36462 . 36676) (
-DLSETLOCKBIT 36678 . 36940) (DLCOPYPAGEMAP 36942 . 39993) (DLCOPYVMPAGE 39995 . 40385) (
-DLADDPAGEMAPENTRIES 40387 . 41202) (ASSIGNFILEPAGE 41204 . 42437) (ASSIGNFILEPAGERANGE 42439 . 42846) 
-(DLDUMPSYSOUT 42848 . 44600) (DLDUMPFPTOVP 44602 . 45641) (DLDUMPPAGEMAPS 45643 . 46343) (
-DLDUMPVMEMPAGES 46345 . 47001) (DLSETBOOTPTR 47003 . 47233) (DLDUMPARRAY 47235 . 47622) (
-DLMARKASDUMPED 47624 . 48077) (DLDUMPVMEMPAGE 48079 . 48767) (INSTALLDOMINO 48769 . 49416) (
-INSTALLDOMINO.DIRECT 49418 . 50570) (INSTALLNEWDOMINO 50572 . 52740)) (52764 54121 (DLPRINTFPTOVP 
-52774 . 53063) (PRINTPRIMARYMAP 53065 . 53779) (DLREADPAGEOFWORDS 53781 . 53948) (SETDIF 53950 . 54119
+  (FILEMAP (NIL (3862 4722 (MAKEINITGREET 3872 . 4720)) (4905 11290 (LOADMAKEINIT 4915 . 6118) (
+LOADMKIFILES 6120 . 6435) (RELOAD 6437 . 6920) (MAKEINIT 6922 . 10582) (MKI.START 10584 . 11288)) (
+11368 17086 (MKI.PASSFILE 11378 . 14988) (SCRATCHARRAY 14990 . 15639) (DOFORM 15641 . 16318) (
+CONSTFORMP 16320 . 16554) (NOTICECOMS 16556 . 16864) (EVALFORMAKEINIT 16866 . 17084)) (17087 19207 (
+I.ADDTOVAR 17097 . 17191) (I.DECLARE%: 17193 . 17469) (I.DEFINE-FILE-INFO 17471 . 17661) (
+I.FILECREATED 17663 . 18037) (I.PUTPROPS 18039 . 18152) (I.RPAQ 18154 . 18375) (I.RPAQQ 18377 . 18573)
+ (I.RPAQ? 18575 . 18790) (I.SETTOPVAL 18792 . 19024) (I.NOUNDO 19026 . 19205)) (19843 26059 (
+I.ATOMNUMBER 19853 . 20344) (I.\ATOMCELL 20346 . 22099) (I.FIXUPNUM 22101 . 23026) (I.FIXUPPTR 23028
+ . 23509) (I.FIXUPSYM 23511 . 24567) (I.WORDSPERNAMEENTRY 24569 . 25324) (I.SETSTKNTOFFSET 25326 . 
+26057)) (26091 27599 (MKI.ATOM 26101 . 26297) (MKI.IEEE 26299 . 27597)) (27696 28461 (MKI.DSET 27706
+ . 27989) (MKI.ADDTO 27991 . 28176) (MKI.PUTPROP 28178 . 28459)) (28635 29187 (DUMPVP 28645 . 28742) (
+BOUTZEROS 28744 . 28823) (BIN16 28825 . 29006) (BOUT16 29008 . 29185)) (30078 52812 (DLFIXINIT 30088
+ . 31063) (DLSORTSYSOUTPAGES 31065 . 36191) (DLNEXTFP 36193 . 36530) (DLLOCKEDPAGEP 36532 . 36746) (
+DLSETLOCKBIT 36748 . 37010) (DLCOPYPAGEMAP 37012 . 40063) (DLCOPYVMPAGE 40065 . 40455) (
+DLADDPAGEMAPENTRIES 40457 . 41272) (ASSIGNFILEPAGE 41274 . 42507) (ASSIGNFILEPAGERANGE 42509 . 42916) 
+(DLDUMPSYSOUT 42918 . 44670) (DLDUMPFPTOVP 44672 . 45711) (DLDUMPPAGEMAPS 45713 . 46413) (
+DLDUMPVMEMPAGES 46415 . 47071) (DLSETBOOTPTR 47073 . 47303) (DLDUMPARRAY 47305 . 47692) (
+DLMARKASDUMPED 47694 . 48147) (DLDUMPVMEMPAGE 48149 . 48837) (INSTALLDOMINO 48839 . 49486) (
+INSTALLDOMINO.DIRECT 49488 . 50640) (INSTALLNEWDOMINO 50642 . 52810)) (52834 54191 (DLPRINTFPTOVP 
+52844 . 53133) (PRINTPRIMARYMAP 53135 . 53849) (DLREADPAGEOFWORDS 53851 . 54018) (SETDIF 54020 . 54189
 )))))
 STOP
diff --git a/internal/loadups/MAKEINIT.LCOM b/internal/loadups/MAKEINIT.LCOM
index 2a2c0084cb2ad6a9865cfe9dba267d11dbda2ec3..004bbd16bc05641c06360483d5644ff5a21de211 100644
GIT binary patch
delta 858
zcmaJ=%Wl&^6tzPtK_nz3sD!e*q_iYOvF71NY(%LQk0U331ltXX1QJnGm57j3kS-7s
z5i7*5m4ARgV37ra4NErt57vA^8M_3cg6hT0xijZJ&b{MLpT+NA#iQ<Zt!f_bR|z5%
zFf}MK5I%mc&W7XZ-pg@+v^ARa2Zsl*wmh@N9N&qhdvXOzu<S+*MKLHX!E|@>;$U=V
z0K+j9N@lwq!7@>jq!JAJ)4joe1L&nnp=>)YtB0&;#>_g$;?-e8))OqQuU%9g6ckz3
zQSwg2H-Ik5(+sK^3O;_barXj$Tq!KHHbTbY<fpx!JZKbW2qMQYHbWM%*bYK3+5{Ug
zM7=23iPO5dNx*WVwrlq6z>h5_Wc4@*9TxE`3YMETFlAOiXbE{i+!y#axRS2L3=az_
z{?;z;3Ync<ouOHJGf9_+&z`1Rcy%S+qRi!*P}X>I*LJ#T5>QoGr~p|5D+rlydJO0i
zCIq;YIB0iF7chdx!r*gIbgtxY`7!}J1WLdGtU}O|;z05O%dvZs?MER0bHqb{LZD1_
znaH51H3AqTRI4PX;%d@uYAabYlB4GB!rCQK$X!mgBww2Fq?YwLYx9o($nh=UZ}YL&
zah)gzT>GOdn~sSP!aTpnESL4FsrG8e3?rT&)AND&;rujrf<=9PB5&tcbq(5lWG2G8
y$`Q`c{FeSU&lw-@|H$PCnt#}SpW7fv<^-7&2%;QO-iR|-{^$I5<y^J?`sObmMA2>l

delta 614
zcmZutO=}cE5S>|8&;cP310Kr};tn!PS9kC1P79hzx<^`PKbV<F_GZY&D2Z7~vIh|o
z$R*b-IruX?3@G{syoi6pzhSp=br0Kzs#o-@s`u*qH}}&Q_i}5Qg~?<uq=YiSw%|l?
zI^B=Xj>nUuo!#Td-Q>B_JzX{*wFB^h{$~>ugbE(}aI!Og`|jYu2;Llm=ck)l2J^&b
zv+2WV`($^tXh4hlf!9cNrZ#ewlu8;B3$H%A%hS{Q4;RRQ7Uz_JCzRA>xIP5`)zS9h
zzJGP@;vGi9XOn|#JCq3)3yRYZs|)Nzfj9H^G*_wwAv<0}1A@$~VXFu<5GaO4fAhLb
zO(}IT$dX~&@0C*LYNPDuS``5}+;N@SO~<@F8*a^`GshX*dhPW~n+CUU*pzrSE;$Vz
zo29AVvU`Cum<a>QLH2XiOS%eh4s+-#nW<rDJHi)9UYHxQ$cX!=2rz~mV$kLXR%i?j
z7IQPN6?G^e64D8(kM$qul4=yK)mKOx20$SpNFsyq530V3)4E}Fp8TrS5UYFZ7qwM1
ZN(R6!0hvL}oat{X(pf83Kjr(ozX3Gpk)Hqn


From 204605268ea845ac3c127c6a8410b113942dc9f1 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 7 Aug 2023 14:53:33 -0700
Subject: [PATCH 24/28] Remove venuesysouts from release tars

---
 scripts/release-make-tars.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/release-make-tars.sh b/scripts/release-make-tars.sh
index 69fae765..64fc055c 100755
--- a/scripts/release-make-tars.sh
+++ b/scripts/release-make-tars.sh
@@ -61,8 +61,10 @@ tar -c -z -f "${release_dir}"/$tag-loadups.tgz                  \
 echo making releases/${short_tag}/$tag-runtime.tgz
 
 tar -c -z -f "${release_dir}"/$tag-runtime.tgz                  \
-    --exclude "*~" --exclude "*#*"                              \
+    --exclude "*~"                                              \
+    --exclude "*#*"                                             \
     --exclude exports.all                                       \
+    --exclude "venuesysouts"                                   \
     ${name_xform}                                               \
     "${dirname}"/clos                                           \
     "${dirname}"/docs/dinfo                                     \

From 3cefaf338c3f6812be51f12b8ef9a472c5bd2ce4 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Mon, 7 Aug 2023 17:24:38 -0700
Subject: [PATCH 25/28] Ensure that the LOADUP_OUTDIR directory exists as part
 of the loadup-setup.sh

---
 scripts/loadup-setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index c94e73b7..acd49194 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -17,6 +17,7 @@ then
 fi
 
 mkdir -p "${LOADUP_WORKDIR}"
+mkdir -p "${LOADUP_OUTDIR}"
 
 scr="-sc 1024x768 -g 1042x790"
 

From 3aa01c7a38b83e62720f6f72a438a41df8eb97fc Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 7 Aug 2023 18:00:53 -0700
Subject: [PATCH 26/28] Making @nbrigg's check for existance of LOADUP_OUTDIR
 and LOADUP_WORKDIR a bit fancier

---
 scripts/loadup-setup.sh | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index acd49194..61affc98 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -16,8 +16,26 @@ then
   export LOADUP_OUTDIR="${MEDLEYDIR}"/loadups
 fi
 
-mkdir -p "${LOADUP_WORKDIR}"
-mkdir -p "${LOADUP_OUTDIR}"
+if [ ! -d "${LOADUP_OUTDIR}" ];
+then
+  if [ ! -e "${LOADUP_OUTDIR}" ];
+  then
+    mkdir -p "${LOADUP_OUTDIR}"
+  else
+    "Error: ${LOADUP_OUTDIR} exists but is not a directory. Exiting."
+  fi
+fi
+
+if [ ! -d "${LOADUP_WORKDIR}" ];
+then
+  if [ ! -e "${LOADUP_WORKDIR}" ];
+  then
+    mkdir -p "${LOADUP_WORKDIR}"
+  else
+    "Error: ${LOADUP_WORKDIR} exists but is not a directory. Exiting."
+  fi
+fi
+
 
 scr="-sc 1024x768 -g 1042x790"
 

From 3ed4d52f532f4d3a84c967c81915b3c8559d2916 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Mon, 7 Aug 2023 22:30:12 -0700
Subject: [PATCH 27/28] Remove junk accidently added to loadup-db.sh.  Fix CM
 file in loadup-db-from-full.sh to add internal/loadups to DIRECTORIES so
 files in this subdir can be analyzed.  Add delay into loadup-mid-from-init.sh
 to make sure timestamp race conditions are avoided.

---
 scripts/loadup-db-from-full.sh  | 10 ++++++++-
 scripts/loadup-db.sh            | 36 ---------------------------------
 scripts/loadup-mid-from-init.sh |  3 +++
 3 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/scripts/loadup-db-from-full.sh b/scripts/loadup-db-from-full.sh
index 8b368d50..6517fb3e 100755
--- a/scripts/loadup-db-from-full.sh
+++ b/scripts/loadup-db-from-full.sh
@@ -9,6 +9,13 @@ fi
 
 loadup_start
 
+SYSOUT="${MEDLEYDIR}/loadups/full.sysout"
+if [ ! -f "${SYSOUT}" ];
+then
+  echo "Error: cannot find ${SYSOUT}.  Exiting."
+  exit 1
+fi
+
 cat >"${cmfile}" <<"EOF"
 "
 
@@ -16,6 +23,7 @@ cat >"${cmfile}" <<"EOF"
   ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /))))
   (IL:MEDLEY-INIT-VARS)
   (IL:FILESLOAD MEDLEY-UTILS)
+  (SETQ IL:DIRECTORIES (CONS (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) IL:DIRECTORIES))
   (IL:MAKE-FULLER-DB
     (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble)))
     (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database)))
@@ -27,7 +35,7 @@ cat >"${cmfile}" <<"EOF"
 "
 EOF
 
-./run-medley ${scr} -loadup "${cmfile}" -full
+./run-medley ${scr} -loadup "${cmfile}" "${SYSOUT}"
 
 loadup_finish "fuller.database" "fuller*"
 
diff --git a/scripts/loadup-db.sh b/scripts/loadup-db.sh
index ebd7841e..d0f89f7a 100755
--- a/scripts/loadup-db.sh
+++ b/scripts/loadup-db.sh
@@ -7,42 +7,6 @@ fi
 
 . scripts/loadup-setup.sh
 
-loadup_start
-
-cat >"${cmfile}" <<"EOF"
-"
-
-(PROG
-  ((WORKDIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_WORKDIR)) (QUOTE /)))
-   (LOADUP-SOURCE-DIR (IL:CONCAT (QUOTE {DSK}) (IL:UNIX-GETENV (QUOTE LOADUP_SOURCEDIR)) (QUOTE /)))
-  )
-  (IL:MEDLEY-INIT-VARS)
-  (IL:FILESLOAD MEDLEY-UTILS)
-  (SETQ IL:DIRECTORIES (CONS LOADUP-SOURCE-DIR IL:DIRECTORIES))
-  (IL:MAKE-FULLER-DB
-    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.dribble)))
-    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.database)))
-    (IL:CONCAT WORKDIR (IL:L-CASE (QUOTE fuller.sysout)))
-  )
-  (IL:LOGOUT T)
-)
-
-"
-EOF
-
-./run-medley ${scr} -loadup "${cmfile}" -full
-
-loadup_finish "fuller.database" "fuller*"
-
-#!/bin/sh
-
-if [ ! -x run-medley ] ; then
-    echo run from MEDLEYDIR
-    exit 1
-fi
-
-. scripts/loadup-setup.sh
-
 ./scripts/loadup-db-from-full.sh && ./scripts/copy-db.sh
 
 if [ $? -eq 0 ];
diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index 7efc13e4..056411a3 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -9,6 +9,9 @@ fi
 
 loadup_start
 
+# wait to make sure timestamp ages enough since this run-medley is very short
+sleep 2
+
 cat >"${cmfile}" <<"EOF"
 "
 (MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))

From 41b5870164902b7c822bccfdbb4645a23cdc11a8 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Sun, 13 Aug 2023 21:13:48 -0700
Subject: [PATCH 28/28] Switch comparison of timestamp tocraeted file to ensure
 that when the times are equal it is counted as success and not failure. 
 Remove two second wait from loadup-mid-from-init, which was a previous
 attempt to solve same issue.

---
 scripts/loadup-mid-from-init.sh | 3 ---
 scripts/loadup-setup.sh         | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/loadup-mid-from-init.sh b/scripts/loadup-mid-from-init.sh
index 056411a3..7efc13e4 100755
--- a/scripts/loadup-mid-from-init.sh
+++ b/scripts/loadup-mid-from-init.sh
@@ -9,9 +9,6 @@ fi
 
 loadup_start
 
-# wait to make sure timestamp ages enough since this run-medley is very short
-sleep 2
-
 cat >"${cmfile}" <<"EOF"
 "
 (MOVD? (QUOTE NILL) (QUOTE PROMPTPRINT))
diff --git a/scripts/loadup-setup.sh b/scripts/loadup-setup.sh
index 61affc98..28b4cb00 100644
--- a/scripts/loadup-setup.sh
+++ b/scripts/loadup-setup.sh
@@ -54,13 +54,13 @@ loadup_start () {
 loadup_finish () {
   local exit_code
   rm -f "${cmfile}"
-  if [ "${LOADUP_WORKDIR}/${1}" -nt "${LOADUP_WORKDIR}"/loadup.timestamp ];
+  if [ "${LOADUP_WORKDIR}"/loadup.timestamp -nt "${LOADUP_WORKDIR}/${1}"  ];
   then
-    echo "+++++ SUCCESS +++++"
-    exit_code=0
-  else
     echo "----- FAILURE -----"
     exit_code=1
+  else
+    echo "+++++ SUCCESS +++++"
+    exit_code=0
   fi
   echo "..... files created ....."
     shift;