From 24ad679d7cca976989142eaa8427e937a72acf84 Mon Sep 17 00:00:00 2001 From: charlie Date: Mon, 10 Jan 2022 15:29:43 +0800 Subject: [PATCH] improve(plugin): compatible for non-semver release package --- src/electron/electron/plugin.cljs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/electron/electron/plugin.cljs b/src/electron/electron/plugin.cljs index 07c90b859..bc029a5d6 100644 --- a/src/electron/electron/plugin.cljs +++ b/src/electron/electron/plugin.cljs @@ -121,7 +121,8 @@ (defn install-or-update! [{:keys [version repo only-check] :as item}] (when repo - (let [updating? (and version (. semver valid version))] + (let [coerced-version (and version (. semver coerce version)) + updating? (and version (. semver valid coerced-version))] (debug (if updating? "Updating:" "Installing:") repo) @@ -134,12 +135,13 @@ _ (debug "[Release Asset] #" latest-version " =>" (:url asset)) ;; compare latest version - _ (when (and updating? latest-version - (. semver valid latest-version)) + _ (when-let [coerced-latest-version + (and updating? latest-version + (. semver coerce latest-version))] (debug "[Updating Latest?] " version " > " latest-version) - (if (. semver lt version latest-version) + (if (. semver lt coerced-version coerced-latest-version) (debug "[Updating Latest] " latest-version) (throw (js/Error. :no-new-version)))) @@ -147,6 +149,7 @@ (:browser_download_url asset) asset) _ (when-not dl-url + (debug "[Download URL Error]" asset) (throw (js/Error. :release-asset-not-found))) dest (.join path cfgs/dot-root "plugins" (:id item))