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