From 9da8ac6c6876099fb739cdfca53197038eb22829 Mon Sep 17 00:00:00 2001 From: Charlie Date: Mon, 31 May 2021 17:05:56 +0800 Subject: [PATCH 1/2] fix(desktop): broken version of checking updates manually --- src/electron/electron/updater.cljs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/electron/electron/updater.cljs b/src/electron/electron/updater.cljs index bc165ee2e..6f7e485a5 100644 --- a/src/electron/electron/updater.cljs +++ b/src/electron/electron/updater.cljs @@ -56,6 +56,11 @@ (emit "checking-for-update" nil) (-> (p/let [artifact (get-latest-artifact-info repo) + + artifact (when-let [remote-version (and artifact (re-find #"\d+.\d+.\d+" (:url artifact)))] + (if (and (. semver valid remote-version) + (. semver lt electron-version remote-version)) artifact)) + url (if-not artifact (do (emit "update-not-available" nil) (throw nil)) (:url artifact)) _ (if url (emit "update-available" (bean/->js artifact)) (throw (js/Error. "download url not exists"))) ;; start download FIXME: user's preference about auto download From bf623d3dcbf88cd5453fb9cbe06de1f2f3048387 Mon Sep 17 00:00:00 2001 From: charlie Date: Tue, 1 Jun 2021 10:54:40 +0800 Subject: [PATCH 2/2] fix(desktop): regexp of app semver --- src/electron/electron/updater.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/electron/electron/updater.cljs b/src/electron/electron/updater.cljs index 6f7e485a5..ec404a5b4 100644 --- a/src/electron/electron/updater.cljs +++ b/src/electron/electron/updater.cljs @@ -57,7 +57,7 @@ (-> (p/let [artifact (get-latest-artifact-info repo) - artifact (when-let [remote-version (and artifact (re-find #"\d+.\d+.\d+" (:url artifact)))] + artifact (when-let [remote-version (and artifact (re-find #"\d+\.\d+\.\d+" (:url artifact)))] (if (and (. semver valid remote-version) (. semver lt electron-version remote-version)) artifact)) @@ -113,7 +113,7 @@ [repo] (when (.valid semver electron-version) (p/let [info (get-latest-artifact-info repo)] - (when-let [remote-version (and info (re-find #"\d+.\d+.\d+" (:url info)))] + (when-let [remote-version (and info (re-find #"\d+\.\d+\.\d+" (:url info)))] (if (and (. semver valid remote-version) (. semver lt electron-version remote-version))