Fix setup.sh

.github/workflows/ci.yaml

@@ -35,3 +35,5 @@ jobs:
         run: |
           PATH="~/.roswell/bin:$PATH"
           rove qlot.asd
+      - name: Run setup.sh
+        run: scripts/setup.sh

proxy.lisp

@@ -19,23 +19,28 @@
   ;; For some reason, a separate function definition
   ;; works as expected.
   (defun qlot-http-fetch (url &rest rest)
-    (let ((ql:*proxy-url*
-            (if (eql (search #1="qlot://localhost/" url
-                             :end2 (length #1#))
-                     0)
-                nil
-                ql:*proxy-url*)))
-      (apply #'orig-http-fetch url rest))))
+    (if (find :quicklisp *features*)
+        (progv (list (intern (string '#:*proxy-utl*) '#:ql))
+            (list
+             ;; do not use proxy if connect localhost
+             (if (eql (search #1="qlot://localhost/" url
+                              :end2 (length #1#))
+                      0)
+                 nil
+                 (symbol-value (intern (string '#:*proxy-utl*) '#:ql))))
+          (apply #'orig-http-fetch url rest))
+        (apply #'orig-http-fetch url rest))))
 
 #+quicklisp
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (fboundp 'orig-http-fetch)
     ;; dummy for suppress style warning
     (defun orig-http-fetch (&rest args)
-      (declare (ignore args)))
-    (setf (symbol-function 'orig-http-fetch)
-          (fdefinition
-           (find-symbol (string '#:http-fetch) '#:ql-http)))
-    ;; do not use proxy if connect localhost
-    (setf (fdefinition (find-symbol (string '#:http-fetch) '#:ql-http))
-          #'qlot-http-fetch)))
+      (declare (ignore args))
+      (error "A dummy function is called"))
+    (when (find-package '#:ql-http)
+      (setf (symbol-function 'orig-http-fetch)
+            (fdefinition
+             (find-symbol (string '#:http-fetch) '#:ql-http)))
+      (setf (fdefinition (find-symbol (string '#:http-fetch) '#:ql-http))
+            #'qlot-http-fetch))))

scripts/fetch.sh

@@ -4,7 +4,7 @@ QLOT_SOURCE_DIR=$(cd "$(dirname "$0")/../" 2>&1 && pwd -P)
 
 errmsg() { echo -e "\e[31mError: $1\e[0m" >&2; }
 if [ "$(which ros 2>/dev/null)" != "" ]; then
-  lisp="ros without-roswell=t -L sbcl-bin run --"
+  lisp="ros +Q -L sbcl-bin run --"
 elif [ "$(which sbcl 2>/dev/null)" != "" ]; then
   lisp="sbcl"
 else

scripts/qlot-installer.sh

@@ -41,7 +41,7 @@ check_requirement "which"
 if [ "$(which sbcl 2>/dev/null)" != "" ]; then
   lisp="sbcl"
 elif [ "$(which ros 2>/dev/null)" != "" ]; then
-  lisp="ros without-roswell=t -L sbcl-bin run --"
+  lisp="ros +Q -L sbcl-bin run --"
 else
   errmsg "sbcl is required to setup Qlot."
   exit 1

scripts/qlot-uninstaller.sh

@@ -11,7 +11,7 @@ fi
 if [ "$(which sbcl 2>/dev/null)" != "" ]; then
   lisp="sbcl"
 elif [ "$(which ros 2>/dev/null)" != "" ]; then
-  lisp="ros without-roswell=t -L sbcl-bin run --"
+  lisp="ros +Q -L sbcl-bin run --"
 else
   exit
 fi

scripts/run.sh

@@ -13,7 +13,7 @@ check_qlot_directory() {
 errmsg() { echo -e "\e[31mError: $1\e[0m" >&2; }
 
 if [ "$(which ros 2>/dev/null)" != "" ]; then
-  lisp="ros without-roswell=t -L sbcl-bin run --"
+  lisp="ros +Q -L sbcl-bin run --"
 elif [ "$(which sbcl 2>/dev/null)" != "" ]; then
   lisp="sbcl"
 else

scripts/setup.sh

@@ -6,7 +6,7 @@ QLOT_SOURCE_DIR=$(cd "$(dirname "$0")/../" 2>&1 >/dev/null && pwd -P)
 
 errmsg() { echo -e "\e[31mError: $1\e[0m" >&2; }
 if [ "$(which ros 2>/dev/null)" != "" ]; then
-  lisp="ros without-roswell=t -L sbcl-bin run --"
+  lisp="ros +Q -L sbcl-bin run --"
 elif [ "$(which sbcl 2>/dev/null)" != "" ]; then
   lisp="sbcl"
 else
@@ -23,6 +23,11 @@ if [ ! -f "$QLOT_SOURCE_DIR/.bundle-libs/bundle.lisp" ]; then
       --eval "(asdf:load-asd #P\"$QLOT_SOURCE_DIR/qlot.asd\")" \
       --eval '(asdf:load-system :qlot/install/quicklisp)' \
       --eval "(qlot/install/quicklisp:install-quicklisp \"$QLOT_SOURCE_DIR/.qlot/\")"
+    if [ ! -d "$QLOT_SOURCE_DIR/.qlot/dists/quicklisp" ]; then
+      $lisp --noinform --no-sysinit --no-userinit --non-interactive \
+        --load "$QLOT_SOURCE_DIR/.qlot/setup.lisp" \
+        --eval '(ql-dist:install-dist "https://beta.quicklisp.org/dist/quicklisp.txt" :prompt nil)'
+    fi
   else
     $lisp --noinform --no-sysinit --no-userinit --non-interactive \
       --load $QLOT_SOURCE_DIR/.qlot/setup.lisp \