X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/10427eb21d77a0edeb2f17e434515b91b420cdfb..47af3df3850a1a17ee706b278868309d40bacd55:/runlisp-base.conf

diff --git a/runlisp-base.conf b/runlisp-base.conf
index 00bfa91..fb9f8ad 100644
--- a/runlisp-base.conf
+++ b/runlisp-base.conf
@@ -111,12 +111,17 @@ 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}
 
-;; Command to delete image.
-delete-image = rm -f ${image-path}
-
 ;;;--------------------------------------------------------------------------
 [sbcl]
 
@@ -230,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}"}
 		--
 
@@ -248,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)"