From b5260d6af32ad0960b4bf974730934ca5c56d48b Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Wed, 19 Oct 2022 23:40:40 -0300
Subject: Makefile: Include working Lisp image for SBCL

---
 Makefile | 12 ++++++++----
 bin/cl   | 16 +++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 7384fb2..f5a86ab 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,16 @@ pod2man = \
 	share/man/man1/z.1 \
 
 
+lisp-images = \
+	$(XDG_DATA_HOME)/lisp-cli/clisp.image \
+	$(XDG_DATA_HOME)/lisp-cli/sbcl.image  \
+
 derived-assets = \
 	$(pod2man)                            \
 	$(XDG_CONFIG_HOME)/ssh/id_rsa.pub     \
 	$(XDG_DATA_HOME)/common-lisp/source   \
 	$(XDG_DATA_HOME)/euandreh/e.list.txt  \
-	$(XDG_DATA_HOME)/lisp-cli/clisp.image \
+	$(lisp-images)
 
 
 
@@ -30,9 +34,9 @@ $(XDG_CONFIG_HOME)/ssh/id_rsa.pub:
 $(XDG_DATA_HOME)/euandreh/e.list.txt: ~/Documents/txt/ opt/aux/gen-e-list.sh
 	sh opt/aux/gen-e-list.sh > $@
 
-$(XDG_DATA_HOME)/lisp-cli/clisp.image: $(XDG_CONFIG_HOME)/lisp-cli/init.lisp bin/cl
-	cl \
-		-I clisp                                 \
+$(lisp-images): $(XDG_CONFIG_HOME)/lisp-cli/init.lisp bin/cl
+	I=`echo $@ | awk -F/ '$$0=$$(NF)' | cut -d. -f1` && cl \
+		-I $$I                                   \
 		-v                                       \
 		-e '(ql:quickload :trivial-dump-core)'   \
 		-e '(trivial-dump-core:dump-image "$@")' \
diff --git a/bin/cl b/bin/cl
index 1b9a659..2135f5c 100755
--- a/bin/cl
+++ b/bin/cl
@@ -198,7 +198,7 @@ else
 		          :print NIL)
 		    (uiop:quit 0))
 		  (error (e)
-		    (format *error-output* "~&~%ERROR: ~a" e)
+		    (format *error-output* "~&~%error: ~a~%" e)
 		    (uiop:quit 1)))
 	EOF
 fi
@@ -263,17 +263,19 @@ case "$IMPL" in
 		exit 4
 		;;
 	sbcl)
-		ARGS="--disable-debugger --script $MAIN"
-		if [ "$VERBOSE" = false ]; then
-			ARGS="$ARGS --noinform"
+		ARGS="--load $MAIN"
+		if [ -n "$IMAGE" ]; then
+			set -- --core "$IMAGE"
 		fi
 		if [ "$NO_RC" = true ]; then
 			ARGS="$ARGS --no-sysinit --no-userinit"
 		fi
-		if [ -n "$IMAGE" ]; then
-			set -- --core "$IMAGE"
+		if [ "$VERBOSE" = false ]; then
+			ARGS="--noinform $ARGS"
+		else
+			set -x
 		fi
-		exec sbcl $ARGS "$@"
+		exec sbcl "$@" $ARGS
 		;;
 	*)
 		printf 'Unsupported implementation: "%s".\n\n' "$IMPL" >&2
-- 
cgit v1.2.3