# HG changeset patch
# User ellis <ellis@rwest.io>
# Date 1704318025 18000
# Node ID 2e515a33787e8c5891fd7c55d883e84cbfeea061
# Parent  3acc3526d836bcee86d3e50b6eb712ee459f7104
quicklisp patching

diff -r 3acc3526d836 -r 2e515a33787e makefile
--- a/makefile	Wed Jan 03 14:56:40 2024 -0500
+++ b/makefile	Wed Jan 03 16:40:25 2024 -0500
@@ -84,9 +84,10 @@
 	cd $(SBCL_TARGET)/doc/manual && make
 sbcl-install:sbcl;cd $(SBCL_TARGET) && ./install.sh
 clean-sbcl:$(SBCL_TARGET);cd $(SBCL_TARGET) && ./clean.sh
+
 build/quicklisp.lisp:$(B);cd $< && curl -O https://beta.quicklisp.org/quicklisp.lisp
-quicklisp-install:build/quicklisp.lisp
-	sbcl --load $< --eval '(quicklisp-quickstart:install)'
+quicklisp-install:scripts/quicklisp-install.sh build/quicklisp.lisp;$<
+
 ### Rust
 RUST_TARGET:=build/src/rust
 $(RUST_TARGET):scripts/get-rust.sh $(B);$<
diff -r 3acc3526d836 -r 2e515a33787e scripts/quicklisp-install.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/quicklisp-install.sh	Wed Jan 03 16:40:25 2024 -0500
@@ -0,0 +1,20 @@
+#!/bin/sh
+if [ -z "$QUICKLISP_DIST_VERSION" ] || [ "$QUICKLISP_DIST_VERSION" = "latest" ]; then
+    QUICKLISP_DIST_VERSION=nil
+else
+    QUICKLISP_DIST_VERSION="\"quicklisp/$QUICKLISP_DIST_VERSION\""
+fi
+
+if [ -z "$QUICKLISP_CLIENT_VERSION" ] || [ "$QUICKLISP_CLIENT_VERSION" = "latest" ]; then
+    QUICKLISP_CLIENT_VERSION=nil
+else
+    QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\""
+fi
+
+sbcl --non-interactive \
+     --load build/quicklisp.lisp \
+     --eval "(quicklisp-quickstart:install :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \
+     --eval "(when (equalp \"$QUICKLISP_ADD_TO_INIT_FILE\" \"true\") (ql-util:without-prompting (ql:add-to-init-file)))"
+
+mkdir -pv /usr/local/share/lisp
+cp build/quicklisp.lisp /usr/local/share/lisp/
diff -r 3acc3526d836 -r 2e515a33787e virt/build-ci-worker.sh
--- a/virt/build-ci-worker.sh	Wed Jan 03 14:56:40 2024 -0500
+++ b/virt/build-ci-worker.sh	Wed Jan 03 16:40:25 2024 -0500
@@ -14,6 +14,7 @@
 buildah config --volume /store $id
 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
 buildah config --workingdir /infra $id 
+buildah config --env QUICKLISP_ADD_TO_INIT_FILE=true
 buildah run --net host $id sh -c 'make worker -j4'
 buildah run --net host $id sh -c 'scripts/install-cargo-tools.sh'
 buildah run --net host $id sh -c 'make clean'