branch: elpa/hyperdrive
commit 098cf787608f66cce74352a32530515989dc7a2b
Author: Adam Porter <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: (h/install-process) Rename from h/install-in-progress
---
hyperdrive-lib.el | 2 +-
hyperdrive-vars.el | 4 ++--
hyperdrive.el | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index 7fae61f1b6..fb6df264bb 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -1485,7 +1485,7 @@ process is running."
(defun h/gateway-installing-p ()
"Return non-nil if the gateway program is being installed."
- (process-live-p h/install-in-progress))
+ (process-live-p h/install-process))
(defun h/gateway-installed-p ()
"Return non-nil if the gateway program is installed."
diff --git a/hyperdrive-vars.el b/hyperdrive-vars.el
index f71cbd8403..b0d2140003 100644
--- a/hyperdrive-vars.el
+++ b/hyperdrive-vars.el
@@ -376,8 +376,8 @@ If the version was unexpected,
(defvar h/gateway-process nil
"Hyper-gateway-ushin process.")
-(defvar h/install-in-progress nil
- "Non-nil while hyperdrive is installing or upgrading the gateway.")
+(defvar h/install-process nil
+ "When non-nil, the curl process downloading the gateway for
install/upgrade.")
(defvar h//gateway-starting-timer nil
"The timer used when the gateway is starting.")
diff --git a/hyperdrive.el b/hyperdrive.el
index 5dcf3208b0..864b4e0725 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -1324,7 +1324,7 @@ If FORCEP, don't prompt for confirmation before
downloading."
;; TODO: Prompt before downloading.
(download url sha256))
;; TODO: Is it correct to set the global var to nil here and in
callback?
- (setf h/install-in-progress nil)
+ (setf h/install-process nil)
(h/menu-refresh)
(h/error "Downloading failed; no more mirrors available")))
(head-size (url)
@@ -1332,7 +1332,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
+ (setf h/install-process
(plz 'get url :as 'file :timeout nil
:then (lambda (filename)
(check filename sha256 url))
@@ -1367,7 +1367,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 nil)
+ (setf h/install-process nil)
(h/menu-refresh)
(h/message "Gateway installed. Try \\[%s]"
(if (h//gateway-ready-p)
@@ -1381,7 +1381,7 @@ If FORCEP, don't prompt for confirmation before
downloading."
(unless (h/gateway-installing-p)
(h/user-error "No installation in progress"))
(h/message "Cancelling install")
- (interrupt-process h/install-in-progress))
+ (interrupt-process h/install-process))
(defun h/restart ()
"Restart the gateway."
