Don't reimplement calibre's internal update checking code.

eli-schwartz · Aug 2, 2017 · 879aa4b · 879aa4b
1 parent 73413cd
commit 879aa4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/linux/calibre-upgrade.sh b/linux/calibre-upgrade.sh
@@ -73,7 +73,7 @@ fi
 
 
 if calibre_is_installed; then
-    calibre-debug -c "import urllib as u; from calibre.constants import numeric_version; raise SystemExit(int(numeric_version  < (tuple(map(int, u.urlopen('http://code.calibre-ebook.com/latest').read().split('.'))))))"
+    calibre-debug -c "from calibre.gui2.update import get_newest_version; from calibre.constants import numeric_version; raise SystemExit(int(numeric_version < get_newest_version()))"
     UP_TO_DATE=$?
 else
     echo -e "Calibre is not installed, installing...\n\n"

diff --git a/osx/calibre-upgrade.sh b/osx/calibre-upgrade.sh
@@ -81,7 +81,8 @@ done
 # Main
 
 if calibre_is_installed; then
-    $tools/calibre-debug -c "import urllib as u; from calibre.constants import numeric_version; raise SystemExit(int(numeric_version  < (tuple(map(int, u.urlopen('http://calibre-ebook.com/downloads/latest_version').read().split('.'))))))"
+    $tools/calibre-debug -c "from calibre.gui2.update import get_newest_version; from calibre.constants import numeric_version; raise SystemExit(int(numeric_version < get_newest_version()))"
+
     UP_TO_DATE=$?
 else
     echo -e "Calibre is not installed, installing...\n\n"