diff --git a/literate/setup.org b/literate/setup.org index 83663da..219e6a6 100644 --- a/literate/setup.org +++ b/literate/setup.org @@ -39,8 +39,8 @@ setup_system() { echo -e "${YELLOW}--- Installing System Dependencies ---${NC}" if command_exists apt-get; then sudo apt-get update && sudo apt-get install -y sbcl emacs-nox rlwrap netcat-openbsd curl git socat libssl-dev libncurses5-dev libffi-dev zlib1g-dev libsqlite3-dev - fi - if [ ! -d "$HOME/quicklisp" ]; then + fi + if [ ! -d "$HOME/quicklisp" ]; then curl -O https://beta.quicklisp.org/quicklisp.lisp sbcl --non-interactive --load quicklisp.lisp --eval "(quicklisp-quickstart:install)" --eval "(ql-util:without-prompting (ql:add-to-init-file))" rm quicklisp.lisp @@ -122,8 +122,7 @@ setup_system() { echo -e "${YELLOW}--- Compiling and Loading OpenCortex (this may take a minute) ---${NC}" - sbcl --non-interactive \ - --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ + sbcl --non-interactive --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" \ --eval "(ql:quickload '(:opencortex :croatoan))" @@ -176,8 +175,7 @@ if [[ "$1" == "--boot" ]]; then fi done < "$SCRIPT_DIR/.env" fi - exec sbcl --non-interactive \ - --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ + exec sbcl --non-interactive --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ --eval "(setf *debugger-hook* (lambda (c h) (declare (ignore h)) (format *error-output* \"FATAL LISP ERROR: ~a~%\" c) (uiop:print-backtrace :stream *error-output*) (uiop:quit 1)))" \ --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" \ --eval "(format t \"--- Quickloading OpenCortex ---~%\")" \ @@ -201,8 +199,7 @@ if [[ "$1" == "tui" ]]; then # Launch TUI echo -e "${BLUE}Launching Croatoan TUI...${NC}" - exec sbcl --non-interactive \ - --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ + exec sbcl --non-interactive --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" \ --eval "(ql:quickload :opencortex/tui)" \ --eval "(opencortex.tui:main)" diff --git a/opencortex.sh b/opencortex.sh index 46ec792..0d92c69 100755 --- a/opencortex.sh +++ b/opencortex.sh @@ -42,8 +42,8 @@ setup_system() { echo -e "${YELLOW}--- Installing System Dependencies ---${NC}" if command_exists apt-get; then sudo apt-get update && sudo apt-get install -y sbcl emacs-nox rlwrap netcat-openbsd curl git socat libssl-dev libncurses5-dev libffi-dev zlib1g-dev libsqlite3-dev - fi - if [ ! -d "$HOME/quicklisp" ]; then + fi + if [ ! -d "$HOME/quicklisp" ]; then curl -O https://beta.quicklisp.org/quicklisp.lisp sbcl --non-interactive --load quicklisp.lisp --eval "(quicklisp-quickstart:install)" --eval "(ql-util:without-prompting (ql:add-to-init-file))" rm quicklisp.lisp @@ -125,8 +125,7 @@ setup_system() { echo -e "${YELLOW}--- Compiling and Loading OpenCortex (this may take a minute) ---${NC}" - sbcl --non-interactive \ - --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ + sbcl --non-interactive --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" \ --eval "(ql:quickload '(:opencortex :croatoan))" @@ -206,8 +205,7 @@ if [[ "$1" == "tui" ]]; then # Force absolute paths for core system directories export SKILLS_DIR="${SCRIPT_DIR}/skills" [ -z "$MEMEX_DIR" ] && export MEMEX_DIR="$HOME/memex" -exec sbcl \ - --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ +exec sbcl --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" \ --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" \ --eval "(ql:quickload :opencortex/tui)" \ --eval "(opencortex.tui:main)"