From 8b3f7ebc8dda90ebaafb2693770c80c930517f63 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Tue, 26 Jan 2021 00:20:10 +0000
Subject: [PATCH] Update nightly to commit
 084f0cb28a80a9040bec3927b8a167190fd38d38

---
 nightly/buster/jdk-11/Dockerfile        |  3 +++
 nightly/buster/jdk-11/install-quicklisp | 18 ++++++++++++++++++
 nightly/buster/jdk-15/Dockerfile        |  3 +++
 nightly/buster/jdk-15/install-quicklisp | 18 ++++++++++++++++++
 nightly/buster/jdk-8/Dockerfile         |  3 +++
 nightly/buster/jdk-8/install-quicklisp  | 18 ++++++++++++++++++
 6 files changed, 63 insertions(+)
 create mode 100755 nightly/buster/jdk-11/install-quicklisp
 create mode 100755 nightly/buster/jdk-15/install-quicklisp
 create mode 100755 nightly/buster/jdk-8/install-quicklisp

diff --git a/nightly/buster/jdk-11/Dockerfile b/nightly/buster/jdk-11/Dockerfile
index 55a9b3f..9b213f9 100644
--- a/nightly/buster/jdk-11/Dockerfile
+++ b/nightly/buster/jdk-11/Dockerfile
@@ -117,6 +117,9 @@ RUN set -x \
     && rm quicklisp.lisp.asc \
     && rm -rf "$GNUPGHOME"
 
+# Add the script to trivially install Quicklisp
+COPY install-quicklisp /usr/local/bin/install-quicklisp
+
 # Add the entrypoint
 WORKDIR /
 
diff --git a/nightly/buster/jdk-11/install-quicklisp b/nightly/buster/jdk-11/install-quicklisp
new file mode 100755
index 0000000..ae80aa5
--- /dev/null
+++ b/nightly/buster/jdk-11/install-quicklisp
@@ -0,0 +1,18 @@
+#!/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
+
+abcl --batch \
+     --load /usr/local/share/common-lisp/source/quicklisp/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)))"
diff --git a/nightly/buster/jdk-15/Dockerfile b/nightly/buster/jdk-15/Dockerfile
index 773cec6..e246185 100644
--- a/nightly/buster/jdk-15/Dockerfile
+++ b/nightly/buster/jdk-15/Dockerfile
@@ -117,6 +117,9 @@ RUN set -x \
     && rm quicklisp.lisp.asc \
     && rm -rf "$GNUPGHOME"
 
+# Add the script to trivially install Quicklisp
+COPY install-quicklisp /usr/local/bin/install-quicklisp
+
 # Add the entrypoint
 WORKDIR /
 
diff --git a/nightly/buster/jdk-15/install-quicklisp b/nightly/buster/jdk-15/install-quicklisp
new file mode 100755
index 0000000..ae80aa5
--- /dev/null
+++ b/nightly/buster/jdk-15/install-quicklisp
@@ -0,0 +1,18 @@
+#!/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
+
+abcl --batch \
+     --load /usr/local/share/common-lisp/source/quicklisp/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)))"
diff --git a/nightly/buster/jdk-8/Dockerfile b/nightly/buster/jdk-8/Dockerfile
index ca65191..2430850 100644
--- a/nightly/buster/jdk-8/Dockerfile
+++ b/nightly/buster/jdk-8/Dockerfile
@@ -117,6 +117,9 @@ RUN set -x \
     && rm quicklisp.lisp.asc \
     && rm -rf "$GNUPGHOME"
 
+# Add the script to trivially install Quicklisp
+COPY install-quicklisp /usr/local/bin/install-quicklisp
+
 # Add the entrypoint
 WORKDIR /
 
diff --git a/nightly/buster/jdk-8/install-quicklisp b/nightly/buster/jdk-8/install-quicklisp
new file mode 100755
index 0000000..ae80aa5
--- /dev/null
+++ b/nightly/buster/jdk-8/install-quicklisp
@@ -0,0 +1,18 @@
+#!/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
+
+abcl --batch \
+     --load /usr/local/share/common-lisp/source/quicklisp/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)))"
-- 
GitLab