Permalink
Browse files

don't refer QL-package when Quicklisp isn't available.

  • Loading branch information...
1 parent b5ab99a commit 2c98a9b9b9bf305b8bab065e4b317c033e4ac909 @fukamachi committed Apr 25, 2012
Showing with 7 additions and 4 deletions.
  1. +5 −3 src/install.lisp
  2. +2 −1 src/util.lisp
View
@@ -25,7 +25,8 @@
@export
(defun install (&key quit-lisp)
"Install Shelly into your environment under \"~/.shelly\"."
- (ql:quickload :shelly)
+ #+quicklisp (ql:quickload :shelly)
+ #-quicklisp (asdf:load-system :shelly)
(let ((home-config-path
(merge-pathnames ".shelly/" (user-homedir-pathname)))
@@ -102,14 +103,15 @@ Add this to your shell rc file (\".bashrc\", \".zshrc\" and so on).
"Dump Lisp core image file for faster startup."
(cond
(quit-lisp
- (ql:quickload :shelly)
+ #+quicklisp (ql:quickload :shelly)
+ #-quicklisp (asdf:load-system :shelly)
(shelly.util:shadowing-use-package :shelly)
(save-core-image *dumped-core-path*))
(T
(asdf:run-shell-command "~A ~A '~A' ~A '~A' ~A '~S'"
*current-lisp-path*
*eval-option*
- "(ql:quickload :shelly)"
+ "#+quicklisp (ql:quickload :shelly) #-quicklisp (asdf:load-system :shelly)"
*eval-option*
"(shelly.util:shadowing-use-package :shelly)"
*eval-option*
View
@@ -21,7 +21,8 @@
@export
(defun load-systems (systems)
- (ql:quickload systems :verbose nil :prompt nil)
+ #+quicklisp (ql:quickload systems :verbose nil :prompt nil)
+ #-quicklisp (dolist (system systems) (asdf:load-system system :verbose nil))
(shadowing-use-package
(remove-if-not #'find-package
(if (consp systems)

0 comments on commit 2c98a9b

Please sign in to comment.