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

fix

Browse Source
This commit is contained in:
Michael Wittig 2019-10-13 19:15:32 +02:00
parent 92c88b2637
commit f93bf9379e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup/linux-installer.py
View File

@ -11,13 +11,11 @@ import ssl, socket, stat
from contextlib import closing from contextlib import closing
is64bit = platform.architecture()[0] == '64bit' is64bit = platform.architecture()[0] == '64bit'
DLURL = 'https://calibre-ebook.com/dist/linux'+('64' if is64bit else '32')
DLURL = os.environ.get('CALIBRE_INSTALLER_LOCAL_URL', DLURL)
py3 = sys.version_info[0] > 2 py3 = sys.version_info[0] > 2
enc = getattr(sys.stdout, 'encoding', 'utf-8') or 'utf-8' enc = getattr(sys.stdout, 'encoding', 'utf-8') or 'utf-8'
if enc.lower() == 'ascii': if enc.lower() == 'ascii':
enc = 'utf-8' enc = 'utf-8'
calibre_version = signature = None dl_url = calibre_version = signature = None
has_ssl_verify = hasattr(ssl, 'create_default_context') has_ssl_verify = hasattr(ssl, 'create_default_context')
if py3: if py3:
@ -286,7 +284,7 @@ def do_download(dest):
offset = os.path.getsize(dest) offset = os.path.getsize(dest)
# Get content length and check if range is supported # Get content length and check if range is supported
rq = urlopen(DLURL) rq = urlopen(dl_url)
headers = rq.info() headers = rq.info()
size = int(headers['content-length']) size = int(headers['content-length'])
accepts_ranges = headers.get('accept-ranges', None) == 'bytes' accepts_ranges = headers.get('accept-ranges', None) == 'bytes'
@ -638,18 +636,21 @@ def extract_tarball(raw, destdir):
def get_tarball_info(version): def get_tarball_info(version):
global signature, calibre_version global dl_url, signature, calibre_version
print ('Downloading tarball signature securely...') print ('Downloading tarball signature securely...')
if version: if version:
signature = get_https_resource_securely( signature = get_https_resource_securely(
'https://code.calibre-ebook.com/signatures/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz.sha512') 'https://code.calibre-ebook.com/signatures/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz.sha512')
calibre_version = version calibre_version = version
dl_url = 'https://download.calibre-ebook.com/' + version + '/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz'
else: else:
raw = get_https_resource_securely( raw = get_https_resource_securely(
'https://code.calibre-ebook.com/tarball-info/' + ('x86_64' if is64bit else 'i686')) 'https://code.calibre-ebook.com/tarball-info/' + ('x86_64' if is64bit else 'i686'))
signature, calibre_version = raw.rpartition(b'@')[::2] signature, calibre_version = raw.rpartition(b'@')[::2]
dl_url = 'https://calibre-ebook.com/dist/linux'+('64' if is64bit else '32')
if not signature or not calibre_version: if not signature or not calibre_version:
raise ValueError('Failed to get install file signature, invalid signature returned') raise ValueError('Failed to get install file signature, invalid signature returned')
dl_url = os.environ.get('CALIBRE_INSTALLER_LOCAL_URL', dl_url)
calibre_version = calibre_version.decode('utf-8') calibre_version = calibre_version.decode('utf-8')

11
setup/linux-installer.sh
View File

@ -60,13 +60,11 @@ import ssl, socket, stat
from contextlib import closing from contextlib import closing
is64bit = platform.architecture()[0] == '64bit' is64bit = platform.architecture()[0] == '64bit'
DLURL = 'https://calibre-ebook.com/dist/linux'+('64' if is64bit else '32')
DLURL = os.environ.get('CALIBRE_INSTALLER_LOCAL_URL', DLURL)
py3 = sys.version_info[0] > 2 py3 = sys.version_info[0] > 2
enc = getattr(sys.stdout, 'encoding', 'utf-8') or 'utf-8' enc = getattr(sys.stdout, 'encoding', 'utf-8') or 'utf-8'
if enc.lower() == 'ascii': if enc.lower() == 'ascii':
enc = 'utf-8' enc = 'utf-8'
calibre_version = signature = None dl_url = calibre_version = signature = None
has_ssl_verify = hasattr(ssl, 'create_default_context') has_ssl_verify = hasattr(ssl, 'create_default_context')
if py3: if py3:
@ -335,7 +333,7 @@ def do_download(dest):
offset = os.path.getsize(dest) offset = os.path.getsize(dest)
# Get content length and check if range is supported # Get content length and check if range is supported
rq = urlopen(DLURL) rq = urlopen(dl_url)
headers = rq.info() headers = rq.info()
size = int(headers['content-length']) size = int(headers['content-length'])
accepts_ranges = headers.get('accept-ranges', None) == 'bytes' accepts_ranges = headers.get('accept-ranges', None) == 'bytes'
@ -687,18 +685,21 @@ def extract_tarball(raw, destdir):
def get_tarball_info(version): def get_tarball_info(version):
global signature, calibre_version global dl_url, signature, calibre_version
print ('Downloading tarball signature securely...') print ('Downloading tarball signature securely...')
if version: if version:
signature = get_https_resource_securely( signature = get_https_resource_securely(
'https://code.calibre-ebook.com/signatures/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz.sha512') 'https://code.calibre-ebook.com/signatures/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz.sha512')
calibre_version = version calibre_version = version
dl_url = 'https://download.calibre-ebook.com/' + version + '/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz'
else: else:
raw = get_https_resource_securely( raw = get_https_resource_securely(
'https://code.calibre-ebook.com/tarball-info/' + ('x86_64' if is64bit else 'i686')) 'https://code.calibre-ebook.com/tarball-info/' + ('x86_64' if is64bit else 'i686'))
signature, calibre_version = raw.rpartition(b'@')[::2] signature, calibre_version = raw.rpartition(b'@')[::2]
dl_url = 'https://calibre-ebook.com/dist/linux'+('64' if is64bit else '32')
if not signature or not calibre_version: if not signature or not calibre_version:
raise ValueError('Failed to get install file signature, invalid signature returned') raise ValueError('Failed to get install file signature, invalid signature returned')
dl_url = os.environ.get('CALIBRE_INSTALLER_LOCAL_URL', dl_url)
calibre_version = calibre_version.decode('utf-8') calibre_version = calibre_version.decode('utf-8')