From 7375f0c603cf59bccdac93c571ac665dc1ba5c68 Mon Sep 17 00:00:00 2001
From: Tristan Williams <tgwil@tgwil.net>
Date: Mon, 14 Oct 2024 03:11:07 -0400
Subject: Move quicklisp install to package install section for consistency

---
 new-user-setup.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'new-user-setup.sh')

diff --git a/new-user-setup.sh b/new-user-setup.sh
index c58e90d..d5cf2a1 100755
--- a/new-user-setup.sh
+++ b/new-user-setup.sh
@@ -88,6 +88,19 @@ while
                 x11/arandr \
                 x11-fonts/nerd-fonts \
                 x11/xorg
+
+            # Install Quicklisp
+            if [[ ! -d $HOME/lisp/quicklisp ]]; then
+                curl -o /tmp/ql.lisp http://beta.quicklisp.org/quicklisp.lisp
+                sbcl --no-sysinit --no-userinit --load /tmp/ql.lisp \
+                     --eval '(quicklisp-quickstart:install :path "~/lisp/quicklisp")' \
+                     --quit \
+                     > /dev/null # minimize output
+                echo -e "${GREEN}INFO   : Installed Quicklisp${ENDCOLOR}"
+            else
+                echo -e "${YELLOW}Skipped: Quicklisp. Already installed${ENDCOLOR}"
+            fi
+
             echo "INFO   : Packages installed and updated."
             break;;
         "n"|"N")
@@ -226,17 +239,7 @@ while
             # Common Lisp SBCL Configuration
             place_file $HOME/dotfiles.core/home/.sbclrc $HOME/.sbclrc
             place_directory $HOME/lisp
-            # Install Quicklisp
-            if [[ ! -d $HOME/lisp/quicklisp ]]; then
-                curl -o /tmp/ql.lisp http://beta.quicklisp.org/quicklisp.lisp
-                sbcl --no-sysinit --no-userinit --load /tmp/ql.lisp \
-                     --eval '(quicklisp-quickstart:install :path "~/lisp/quicklisp")' \
-                     --quit \
-                     > /dev/null # minimize output
-                echo -e "${GREEN}INFO   : Installed Quicklisp${ENDCOLOR}"
-            else
-                echo -e "${YELLOW}Skipped: Quicklisp. Already installed${ENDCOLOR}"
-            fi
+
             echo "INFO   : Configuration files placed!"
             break;;
         "n"|"N")
-- 
cgit v1.2.3