WIP updating loadups scripts

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

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.*"
 

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"

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.*"

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*"

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.*"

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"

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}
 }