branch: elpa/hyperdrive
commit 26d2348db8205f119962fa62c9e06a0d645b1b1e
Author: Joseph Turner <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: (h/install) Suggest h/restart; don't prompt to restart
---
hyperdrive.el | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/hyperdrive.el b/hyperdrive.el
index 4214ea50fb..a33807cf35 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -1354,17 +1354,10 @@ gateway version."
(rename-file file-name destination-name)
(chmod destination-name #o755))
(setf h/install-in-progress-p nil)
- (cond ((h/gateway-live-p)
- ;; Gateway running inside of Emacs: prompt to restart it.
- (when (yes-or-no-p "Installed hyper-gateway-ushin. Restart
gateway?")
- (h/restart)))
- ((h//gateway-ready-p)
- ;; Gateway appears to be running outside of Emacs: the user
- ;; must stop it manually before we can start it.
- (h/message "New gateway installed but an existing gateway
process is running outside of Emacs; you must manually stop it before the new
version can be started with \\[hyperdrive-start]"))
- (t
- ;; Gateway not running: prompt the user to start it.
- (h/message "hyper-gateway-ushin installed. Try
\\[hyperdrive-start].")))))
+ (h/message "Gateway installed. Try \\[%s]"
+ (if (h//gateway-ready-p)
+ "hyperdrive-restart"
+ "hyperdrive-start"))))
(try))))
(defun h/restart ()
