[nongnu] elpa/go-mode 218d8c5 346/495: cmd/oracle: emacs: look for oracle on $PATH and nowhere else

[ELPA Syncer]

branch: elpa/go-mode
commit 218d8c5cbfa3298b7f546eb017c3d4c130a5d6a3
Author: Alan Donovan <adonovan@google.com>
Commit: Dominik Honnef <dominik@honnef.co>

    cmd/oracle: emacs: look for oracle on $PATH and nowhere else
    
    Change-Id: Ifbc8e3ff6fe22a56e29fe7ba8004510cb0cee343
    Reviewed-on: https://go-review.googlesource.com/9687
    Reviewed-by: Dominik Honnef <dominik@honnef.co>
    Reviewed-by: David Crawshaw <crawshaw@golang.org>
---
 guru_import/cmd/oracle/oracle.el | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/guru_import/cmd/oracle/oracle.el b/guru_import/cmd/oracle/oracle.el
index c1fb08e..58c082a 100644
--- a/guru_import/cmd/oracle/oracle.el
+++ b/guru_import/cmd/oracle/oracle.el
@@ -22,25 +22,8 @@
   "Options specific to the Go oracle."
   :group 'go)
 
-(defcustom go-oracle-command
-  (let* ((dirs (go-root-and-paths))
-         (gopath (cdr dirs))
-         (gobin (getenv "GOBIN"))
-         (goroot-cmd (concat (car dirs) "/bin/oracle"))
-         cmd)
-    (if gobin
-        (let ((gobin-cmd (concat gobin "/oracle")))
-          (if (file-executable-p gobin-cmd)
-              (setq cmd gobin-cmd)))) ; use $GOBIN/oracle if executable
-    (and (null cmd)
-         gopath
-         (let ((gopath-cmd (concat (car gopath) "/bin/oracle")))
-           (if (file-executable-p gopath-cmd)
-               (setq cmd gopath-cmd)))) ; use GOPATH[0]/bin if executable
-    (or cmd goroot-cmd)) ; use $GOROOT/bin by default
-  "The Go oracle command.  The following directories are
-searched: (1) $GOBIN; (2) dir/bin, where dir is the first
-directory on $GOPATH; (3) $GOROOT/bin."
+(defcustom go-oracle-command "oracle"
+  "The Go oracle command."
   :type 'string
   :group 'go-oracle)