From c7f2857d680011967a7dd0eb7ddead959a8e1c2e Mon Sep 17 00:00:00 2001 From: Tristan Williams Date: Mon, 21 Oct 2024 04:16:35 -0400 Subject: Revert "Use Roswell to manage Lisp instead of manual installation" This reverts commit 4d16bcf21fc84bc9a7be52066c3594630a7c77b2. --- home/.sbclrc | 2 +- new-user-setup.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/home/.sbclrc b/home/.sbclrc index 2c2bd8a..6dd45fd 100644 --- a/home/.sbclrc +++ b/home/.sbclrc @@ -5,7 +5,7 @@ ;; Use Quicklisp #-quicklisp -(let ((quicklisp-init (merge-pathnames ".roswell/lisp/quicklisp/setup.lisp" +(let ((quicklisp-init (merge-pathnames "lisp/quicklisp/setup.lisp" (user-homedir-pathname)))) (when (probe-file quicklisp-init) (load quicklisp-init))) diff --git a/new-user-setup.sh b/new-user-setup.sh index b925b1b..e9b2e59 100755 --- a/new-user-setup.sh +++ b/new-user-setup.sh @@ -87,12 +87,16 @@ while x11/arandr \ x11-fonts/nerd-fonts \ x11/xorg - # Setup Lisp - if command -v ros &> /dev/null; then - ros &> /dev/null - echo -e "${GREEN}INFO : Roswell setup complete.${ENDCOLOR}" + # 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: Roswell not installed.${ENDCOLOR}" + echo -e "${YELLOW}Skipped: Quicklisp. Already installed${ENDCOLOR}" fi echo "INFO : Packages installed and updated." -- cgit v1.2.3