X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/90fec59bc262b3d5050c651fdc6be44a31880099..530dead42e3badb959ef462fd0d9d2d02515a80c:/runlisp-base.conf

diff --git a/runlisp-base.conf b/runlisp-base.conf
index b11f248..ea32156 100644
--- a/runlisp-base.conf
+++ b/runlisp-base.conf
@@ -26,7 +26,7 @@
 ;; Variables are looked up starting in the home (or explicitly specified)
 ;; section, then proceeding to the parents assigned to `@PARENTS'.
 ;; (`@PARENTS' usually defaults to `@COMMON'; the parent of `@COMMON' is
-;; `@BUILTIN'; `@BUILTIN' and `@CONFIG' have no parents.)
+;; `@BUILTIN'; `@BUILTIN' and `@ENV' have no parents.)
 ;;
 ;; At top-level, the text is split into words at whitespace, unless prevented
 ;; by double- and single-quote, or escaped by `\'.  Within single quotes, all
@@ -235,8 +235,8 @@ run-script =
 	$?@image{"${image-path}" -s "${@script}" |
 		 ${@ENV:ECL?ecl} "${@ecl-opt}norc"
 			 "${@ecl-opt}eval" "(progn
-					    ${run-script-prelude}
-					    ${clear-cl-user})"
+					      ${run-script-prelude}
+					      ${clear-cl-user})"
 			 "${@ecl-opt}shell" "${@script}"}
 		--
 
@@ -253,15 +253,16 @@ image-file = ${@name}+asdf.core
 run-script =
 	${command}
 		$?@image{-core "${image-path}" -eval "${image-restore}" |
-			 -batch -noinit -nositeinit -quiet
+			 -batch -noinit -quiet
 				 -eval "(progn
 					  (setf ext:*require-verbose* nil)
-					  ${run-script-prelude})"}
+					  ${run-script-prelude}
+					  ${clear-cl-user})"}
 		-load "${@script}" -eval "(ext:quit)" --
 
 dump-image =
-	${command} -batch -noinit -nositeinit -quiet
-		-eval "${dump-image-prelude}"
+	${command} -batch -noinit -quiet
+		-eval "(progn ${dump-image-prelude} ${clear-cl-user})"
 		-eval "(ext:save-lisp \"${@image-new|q}\"
 				      :batch-mode t :print-herald nil
 				      :site-init nil :load-init-file nil)"