Changeset 13038

Timestamp:

11/20/10 15:41:55 (11 years ago)

Author:

Mark Evenson

Message:

[backport r13034] Better resolution mechanism for 'gpg' binary.

Location:

branches/0.23.x/abcl

Files:

• CHANGES (modified) (1 diff)
• contrib/asdf-install/asdf-install.asd (modified) (1 diff)
• contrib/asdf-install/port.lisp (modified) (2 diffs)
• contrib/asdf-install/variables.lisp (modified) (1 diff)

branches/0.23.x/abcl/CHANGES

@@ -14 +14 @@
 * [svn r12994] New java-interop macros: CHAIN and JMETHOD-LET
 
-* [svn r13031] Ensure that the ASDF registry contains the ASDF-INSTALL locations.
+* [svn r13030-31,r13034] ASDF-INSTALL improvements: Ensure that the
+     ASDF registry contains the ASDF-INSTALL locations.  Better
+     resolution mechanism for 'gpg' binary.
 
 Fixes

branches/0.23.x/abcl/contrib/asdf-install/asdf-install.asd

@@ -13 +13 @@
   #+:sbcl :depends-on
   #+:sbcl (sb-bsd-sockets)
-  :version "0.6.10-ABCL.0"
+  :version "0.6.10-ABCL.1"
   :author "Dan Barlow <dan@telent.net>, Edi Weitz <edi@agharta.de> and many others. See the file COPYRIGHT for more details."
   :maintainer "Gary Warren King <gwking@metabang.com>"

branches/0.23.x/abcl/contrib/asdf-install/port.lisp

@@ -385 +385 @@
     (values (download-url-to-file url tmp) tmp)))
 
+(defun gpg-command () 
+  (find-shell-command *gpg-command*))
+
 (defun gpg-results (package signature)
   (let ((tags nil))
@@ -390 +393 @@
   (gpg-stream 
    (shell-command (format nil "~s --status-fd 1 --verify ~s ~s"
-                                *gpg-command*
+                                (gpg-command)
         (namestring signature) (namestring package))))
       (loop for l = (read-line gpg-stream nil nil)

branches/0.23.x/abcl/contrib/asdf-install/variables.lisp

@@ -49 +49 @@
 ;; bin first
 (defvar *shell-search-paths* '((:absolute "bin")
-                               (:absolute "usr" "bin"))
+                               (:absolute "usr" "bin")
+                               (:absolute "usr" "local" "bin")
+                               (:absolute "opt" "local" "bin"))
   "A list of places to look for shell commands.")