branch: elpa/hyperdrive
commit c69d1dc386318c4d472c562e1c35424ab348f315
Author: Joseph Turner <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: (h/install-in-progress) Rename from h/install-in-progress-p
---
hyperdrive-menu.el | 6 +++---
hyperdrive-vars.el | 2 +-
hyperdrive.el | 14 +++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hyperdrive-menu.el b/hyperdrive-menu.el
index 6c07145ef4..43c5dc5042 100644
--- a/hyperdrive-menu.el
+++ b/hyperdrive-menu.el
@@ -208,9 +208,9 @@
(propertize
(cond ((h//gateway-ready-p) "on")
((h/gateway-live-p) "starting")
- ((and (h/gateway-installed-p) h/install-in-progress-p)
+ ((and (h/gateway-installed-p) h/install-in-progress)
"upgrading")
- (h/install-in-progress-p "installing")
+ (h/install-in-progress "installing")
((h/gateway-installed-p) "off")
(t "not found"))
'face 'transient-value)))
@@ -238,7 +238,7 @@
((h/gateway-installed-p) "Reinstall")
(t "Install")))
:transient t
- :inapt-if-non-nil hyperdrive-install-in-progress-p)]
+ :inapt-if-non-nil hyperdrive-install-in-progress)]
["Bookmark"
("b j" "Jump" h/bookmark-jump)
("b l" "List" h/bookmark-list)
diff --git a/hyperdrive-vars.el b/hyperdrive-vars.el
index e2d0eb5eb6..8d68ba3537 100644
--- a/hyperdrive-vars.el
+++ b/hyperdrive-vars.el
@@ -376,7 +376,7 @@ If the version was unexpected,
(defvar h/gateway-process nil
"Hyper-gateway-ushin process.")
-(defvar h/install-in-progress-p nil
+(defvar h/install-in-progress nil
"Non-nil while hyperdrive is installing or upgrading the gateway.")
(defvar h//gateway-starting-timer nil
diff --git a/hyperdrive.el b/hyperdrive.el
index f19100e7b8..271134b938 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -107,13 +107,13 @@ which see."
((h/gateway-live-p)
(h/message "Gateway already starting."))
((and (not gateway-installed-p)
- (process-live-p h/install-in-progress-p))
+ (process-live-p h/install-in-progress))
(h/user-error "Gateway installation in-progress"))
((not gateway-installed-p)
(h/user-error "Gateway not installed; try \\[hyperdrive-install]"))
(t
(h/message
- (if hyperdrive-install-in-progress-p
+ (if hyperdrive-install-in-progress
"Gateway installation in-progress; starting old gateway
anyway."
"Starting gateway."))
(funcall h/gateway-start-function))))
@@ -1301,7 +1301,7 @@ Intended for relative (i.e. non-full) URLs."
"Download and install hyper-gateway-ushin.
If FORCEP, don't prompt for confirmation before downloading."
(interactive (list current-prefix-arg))
- (when (process-live-p h/install-in-progress-p)
+ (when (process-live-p h/install-in-progress)
(h/error "Installation of gateway already in progress"))
(unless forcep
(when (h/gateway-installed-p)
@@ -1314,7 +1314,7 @@ If FORCEP, don't prompt for confirmation before
downloading."
(pcase-let (((map :url :sha256) url-and-hash))
;; TODO: Prompt before downloading.
(download url sha256))
- (setf h/install-in-progress-p nil)
+ (setf h/install-in-progress nil)
(h/menu-refresh)
(h/error "Downloading failed; no more mirrors available")))
(head-size (url)
@@ -1322,7 +1322,7 @@ If FORCEP, don't prompt for confirmation before
downloading."
(cl-parse-integer
(alist-get 'content-length (plz-response-headers response)))))
(download (url sha256)
- (setf h/install-in-progress-p
+ (setf h/install-in-progress
(plz 'get url :as 'file :timeout nil
:then (lambda (filename)
(check filename sha256 url))
@@ -1357,7 +1357,7 @@ If FORCEP, don't prompt for confirmation before
downloading."
(mkdir h/gateway-directory t))
(rename-file file-name destination-name)
(chmod destination-name #o755))
- (setf h/install-in-progress-p nil)
+ (setf h/install-in-progress nil)
(h/menu-refresh)
(h/message "Gateway installed. Try \\[%s]"
(if (h//gateway-ready-p)
@@ -1369,7 +1369,7 @@ If FORCEP, don't prompt for confirmation before
downloading."
"Stop downloading/installing hyper-gateway-ushin."
(interactive)
(h/message "Cancelling install")
- (interrupt-process h/install-in-progress-p))
+ (interrupt-process h/install-in-progress))
(defun h/restart ()
"Restart the gateway."
