projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.8.2:
[sbcl.git]
/
contrib
/
asdf-install
/
installer.lisp
diff --git
a/contrib/asdf-install/installer.lisp
b/contrib/asdf-install/installer.lisp
index
656c913
..
d17d7e1
100644
(file)
--- a/
contrib/asdf-install/installer.lisp
+++ b/
contrib/asdf-install/installer.lisp
@@
-11,9
+11,9
@@
(let ((path (pathname name)))
(if (pathname-name path)
(merge-pathnames
(let ((path (pathname name)))
(if (pathname-name path)
(merge-pathnames
- (make-pathname :directory `(:relative ,(pathname-name path))
- :name "")
- path)
+ (make-pathname :directory `(:relative ,(pathname-name path)))
+ (make-pathname :directory (pathname-directory path)
+ :host (pathname-host path)))
path)))
(defvar *sbcl-home* (directorify (posix-getenv "SBCL_HOME")))
path)))
(defvar *sbcl-home* (directorify (posix-getenv "SBCL_HOME")))
@@
-163,7
+163,7
@@
(restart-case
(verify-gpg-signature/url url file-name)
(skip-gpg-check (&rest rest)
(restart-case
(verify-gpg-signature/url url file-name)
(skip-gpg-check (&rest rest)
- :report "Don't ckeck GPG signature for this package"
+ :report "Don't check GPG signature for this package"
nil)))))
(defun read-until-eof (stream)
nil)))))
(defun read-until-eof (stream)
@@
-249,7
+249,8
@@
(let* ((tar
(with-output-to-string (o)
(or
(let* ((tar
(with-output-to-string (o)
(or
- (sb-ext:run-program "tar"
+ (sb-ext:run-program #-darwin "tar"
+ #+darwin "gnutar"
(list "-C" (namestring source)
"-xzvf" (namestring packagename))
:output o
(list "-C" (namestring source)
"-xzvf" (namestring packagename))
:output o
@@
-327,7
+328,7
@@
(one-iter packages)))
(let ((p (merge-pathnames "trusted-uids.lisp" *dot-sbcl*)))
(ensure-directories-exist p)
(one-iter packages)))
(let ((p (merge-pathnames "trusted-uids.lisp" *dot-sbcl*)))
(ensure-directories-exist p)
- (with-open-file (out p :direction :output)
+ (with-open-file (out p :direction :output :if-exists :supersede)
(with-standard-io-syntax
(prin1 *trusted-uids* out))))
(dolist (l *temporary-files*)
(with-standard-io-syntax
(prin1 *trusted-uids* out))))
(dolist (l *temporary-files*)