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

Merge branch 'pin-version' of https://github.com/widdix/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-14 07:03:36 +05:30
commit 9536ffe8cd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 78 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
setup/linux-installer.py
View File

@ -1,23 +1,29 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# vim:fileencoding=utf-8 # vim:fileencoding=utf-8
# License: GPLv3 Copyright: 2009, Kovid Goyal <kovid at kovidgoyal.net>
from __future__ import absolute_import, division, print_function, unicode_literals from __future__ import absolute_import, division, print_function, unicode_literals
__license__ = 'GPL v3' import errno
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' import hashlib
__docformat__ = 'restructuredtext en' import os
import platform
import sys, os, shutil, subprocess, re, platform, signal, tempfile, hashlib, errno import re
import ssl, socket, stat import shutil
import signal
import socket
import ssl
import stat
import subprocess
import sys
import tempfile
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 +292,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'
@ -637,19 +643,28 @@ def extract_tarball(raw, destdir):
raise SystemExit(1) raise SystemExit(1)
def get_tarball_info(): 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:
signature = get_https_resource_securely(
'https://code.calibre-ebook.com/signatures/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz.sha512')
calibre_version = version
dl_url = 'https://download.calibre-ebook.com/' + version + '/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz'
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)
if isinstance(calibre_version, bytes):
calibre_version = calibre_version.decode('utf-8') calibre_version = calibre_version.decode('utf-8')
def download_and_extract(destdir): def download_and_extract(destdir, version):
get_tarball_info() get_tarball_info(version)
raw = download_tarball() raw = download_tarball()
if os.path.exists(destdir): if os.path.exists(destdir):
@ -666,7 +681,7 @@ def check_version():
calibre_version = urlopen('http://code.calibre-ebook.com/latest').read() calibre_version = urlopen('http://code.calibre-ebook.com/latest').read()
def run_installer(install_dir, isolated, bin_dir, share_dir): 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':
prints(destdir, 'is not a valid install location. Choose', end='') prints(destdir, 'is not a valid install location. Choose', end='')
@ -679,7 +694,7 @@ def run_installer(install_dir, isolated, bin_dir, share_dir):
return 1 return 1
print('Installing to', destdir) print('Installing to', destdir)
download_and_extract(destdir) download_and_extract(destdir, version)
if not isolated: if not isolated:
pi = [os.path.join(destdir, 'calibre_postinstall')] pi = [os.path.join(destdir, 'calibre_postinstall')]
@ -727,7 +742,7 @@ def check_umask():
raise SystemExit('The system umask is unsuitable, aborting') raise SystemExit('The system umask is unsuitable, aborting')
def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_umask=False): def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_umask=False, version=None):
if not ignore_umask and not isolated: if not ignore_umask and not isolated:
check_umask() check_umask()
machine = os.uname()[4] machine = os.uname()[4]
@ -736,7 +751,7 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_
'You are running on an ARM system. The calibre binaries are only' 'You are running on an ARM system. The calibre binaries are only'
' available for x86 systems. You will have to compile from' ' available for x86 systems. You will have to compile from'
' source.') ' source.')
run_installer(install_dir, isolated, bin_dir, share_dir) run_installer(install_dir, isolated, bin_dir, share_dir, version)
try: try:
@ -767,7 +782,7 @@ def script_launch():
def to_bool(x): def to_bool(x):
return x.lower() in ('y', 'yes', '1', 'true') return x.lower() in ('y', 'yes', '1', 'true')
type_map = {x: path for x in 'install_dir isolated bin_dir share_dir ignore_umask'.split()} type_map = {x: path for x in 'install_dir isolated bin_dir share_dir ignore_umask version'.split()}
type_map['isolated'] = type_map['ignore_umask'] = to_bool type_map['isolated'] = type_map['ignore_umask'] = to_bool
kwargs = {} kwargs = {}

56
setup/linux-installer.sh
View File

@ -49,24 +49,30 @@ $PYTHON -c "import sys; script_launch=lambda:sys.exit('Download of installer fai
# HEREDOC_START # HEREDOC_START
#!/usr/bin/env python2 #!/usr/bin/env python2
# vim:fileencoding=utf-8 # vim:fileencoding=utf-8
# License: GPLv3 Copyright: 2009, Kovid Goyal <kovid at kovidgoyal.net>
from __future__ import absolute_import, division, print_function, unicode_literals from __future__ import absolute_import, division, print_function, unicode_literals
__license__ = 'GPL v3' import errno
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' import hashlib
__docformat__ = 'restructuredtext en' import os
import platform
import sys, os, shutil, subprocess, re, platform, signal, tempfile, hashlib, errno import re
import ssl, socket, stat import shutil
import signal
import socket
import ssl
import stat
import subprocess
import sys
import tempfile
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 +341,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'
@ -686,19 +692,28 @@ def extract_tarball(raw, destdir):
raise SystemExit(1) raise SystemExit(1)
def get_tarball_info(): 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:
signature = get_https_resource_securely(
'https://code.calibre-ebook.com/signatures/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz.sha512')
calibre_version = version
dl_url = 'https://download.calibre-ebook.com/' + version + '/calibre-' + version + '-' + ('x86_64' if is64bit else 'i686') + '.txz'
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)
if isinstance(calibre_version, bytes):
calibre_version = calibre_version.decode('utf-8') calibre_version = calibre_version.decode('utf-8')
def download_and_extract(destdir): def download_and_extract(destdir, version):
get_tarball_info() get_tarball_info(version)
raw = download_tarball() raw = download_tarball()
if os.path.exists(destdir): if os.path.exists(destdir):
@ -715,7 +730,7 @@ def check_version():
calibre_version = urlopen('http://code.calibre-ebook.com/latest').read() calibre_version = urlopen('http://code.calibre-ebook.com/latest').read()
def run_installer(install_dir, isolated, bin_dir, share_dir): 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':
prints(destdir, 'is not a valid install location. Choose', end='') prints(destdir, 'is not a valid install location. Choose', end='')
@ -728,7 +743,7 @@ def run_installer(install_dir, isolated, bin_dir, share_dir):
return 1 return 1
print('Installing to', destdir) print('Installing to', destdir)
download_and_extract(destdir) download_and_extract(destdir, version)
if not isolated: if not isolated:
pi = [os.path.join(destdir, 'calibre_postinstall')] pi = [os.path.join(destdir, 'calibre_postinstall')]
@ -776,7 +791,7 @@ def check_umask():
raise SystemExit('The system umask is unsuitable, aborting') raise SystemExit('The system umask is unsuitable, aborting')
def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_umask=False): def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_umask=False, version=None):
if not ignore_umask and not isolated: if not ignore_umask and not isolated:
check_umask() check_umask()
machine = os.uname()[4] machine = os.uname()[4]
@ -785,7 +800,7 @@ def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None, ignore_
'You are running on an ARM system. The calibre binaries are only' 'You are running on an ARM system. The calibre binaries are only'
' available for x86 systems. You will have to compile from' ' available for x86 systems. You will have to compile from'
' source.') ' source.')
run_installer(install_dir, isolated, bin_dir, share_dir) run_installer(install_dir, isolated, bin_dir, share_dir, version)
try: try:
@ -797,7 +812,8 @@ except NameError:
def update_intaller_wrapper(): def update_intaller_wrapper():
# To run: python3 -c "import runpy; runpy.run_path('setup/linux-installer.py', run_name='update_wrapper')" # To run: python3 -c "import runpy; runpy.run_path('setup/linux-installer.py', run_name='update_wrapper')"
src = open(__file__, 'rb').read().decode('utf-8') with open(__file__, 'rb') as f:
src = f.read().decode('utf-8')
wrapper = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'linux-installer.sh') wrapper = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'linux-installer.sh')
with open(wrapper, 'r+b') as f: with open(wrapper, 'r+b') as f:
raw = f.read().decode('utf-8') raw = f.read().decode('utf-8')
@ -815,7 +831,7 @@ def script_launch():
def to_bool(x): def to_bool(x):
return x.lower() in ('y', 'yes', '1', 'true') return x.lower() in ('y', 'yes', '1', 'true')
type_map = {x: path for x in 'install_dir isolated bin_dir share_dir ignore_umask'.split()} type_map = {x: path for x in 'install_dir isolated bin_dir share_dir ignore_umask version'.split()}
type_map['isolated'] = type_map['ignore_umask'] = to_bool type_map['isolated'] = type_map['ignore_umask'] = to_bool
kwargs = {} kwargs = {}