Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Linux installer: Fix glibc version check also being done when installing older versions

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-12 16:09:50 +05:30
parent 75bbecc534
commit 954cb38135
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup/linux-installer.py
View File

@ -681,12 +681,6 @@ def download_and_extract(destdir, version):
extract_tarball(raw, destdir) extract_tarball(raw, destdir)
def check_version():
global calibre_version
if calibre_version == '%version':
calibre_version = urlopen('http://code.calibre-ebook.com/latest').read()
def run_installer(install_dir, isolated, bin_dir, share_dir, version): def run_installer(install_dir, isolated, bin_dir, share_dir, version):
destdir = os.path.abspath(os.path.expanduser(install_dir or '/opt')) destdir = os.path.abspath(os.path.expanduser(install_dir or '/opt'))
if destdir == '/usr/bin': if destdir == '/usr/bin':
@ -774,7 +768,14 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_
'You are running on a 32-bit system. The calibre binaries are only' 'You are running on a 32-bit system. The calibre binaries are only'
' available for 64-bit systems. You will have to compile from' ' available for 64-bit systems. You will have to compile from'
' source.') ' source.')
check_glibc_version() glibc_versions = {
(6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'}
}
q = tuple(map(int, version.split('.'))) if version else (999999999999, 99, 99)
for key in sorted(glibc_versions, reverse=True):
if q >= key:
check_glibc_version(**glibc_versions[key])
break
run_installer(install_dir, isolated, bin_dir, share_dir, version) run_installer(install_dir, isolated, bin_dir, share_dir, version)

15
setup/linux-installer.sh
View File

@ -730,12 +730,6 @@ def download_and_extract(destdir, version):
extract_tarball(raw, destdir) extract_tarball(raw, destdir)
def check_version():
global calibre_version
if calibre_version == '%version':
calibre_version = urlopen('http://code.calibre-ebook.com/latest').read()
def run_installer(install_dir, isolated, bin_dir, share_dir, version): def run_installer(install_dir, isolated, bin_dir, share_dir, version):
destdir = os.path.abspath(os.path.expanduser(install_dir or '/opt')) destdir = os.path.abspath(os.path.expanduser(install_dir or '/opt'))
if destdir == '/usr/bin': if destdir == '/usr/bin':
@ -823,7 +817,14 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_
'You are running on a 32-bit system. The calibre binaries are only' 'You are running on a 32-bit system. The calibre binaries are only'
' available for 64-bit systems. You will have to compile from' ' available for 64-bit systems. You will have to compile from'
' source.') ' source.')
check_glibc_version() glibc_versions = {
(6, 0, 0) : {'min_required': (2, 31), 'release_date': '2020-02-01'}
}
q = tuple(map(int, version.split('.'))) if version else (999999999999, 99, 99)
for key in sorted(glibc_versions, reverse=True):
if q >= key:
check_glibc_version(**glibc_versions[key])
break
run_installer(install_dir, isolated, bin_dir, share_dir, version) run_installer(install_dir, isolated, bin_dir, share_dir, version)