X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/8996f767e047eefa8af4d01b1434b54f4c169b79..ace01e7181b7882e3039702a251ef97c7a87dcaa:/runlisp-base.conf

diff --git a/runlisp-base.conf b/runlisp-base.conf
index 692faa7..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
@@ -111,6 +111,15 @@ dump-image-prelude =
 	  ${ignore-shebang}
 	  ${set-script-feature})
 
+;; An expression to determine the version information for the running Lisp.
+lisp-version =
+	(list (list* \'lisp
+		     (lisp-implementation-type)
+		     (multiple-value-list (lisp-implementation-version)))
+	      (cons \'asdf
+		    (asdf:component-version (asdf:find-system "asdf"))))
+
+;; Full pathname to custom image.
 image-path = ${@image-dir}/${image-file}
 
 ;;;--------------------------------------------------------------------------
@@ -226,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}"}
 		--
 
@@ -244,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)"