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

Remove no longer needed branches from the linux installer

Browse Source
This commit is contained in:
Kovid Goyal 2015-03-24 13:38:54 +05:30
parent 82cd471ffc
commit 2d768e9f4e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/linux-installer.py
View File

@ -290,8 +290,7 @@ def do_download(dest):
prints('Downloaded %s bytes'%os.path.getsize(dest)) prints('Downloaded %s bytes'%os.path.getsize(dest))
def download_tarball(): def download_tarball():
ext = 'tar.bz2' if calibre_version.startswith('1.') else 'txz' fname = 'calibre-%s-i686.%s'%(calibre_version, 'txz')
fname = 'calibre-%s-i686.%s'%(calibre_version, ext)
if is64bit: if is64bit:
fname = fname.replace('i686', 'x86_64') fname = fname.replace('i686', 'x86_64')
tdir = tempfile.gettempdir() tdir = tempfile.gettempdir()
@ -593,10 +592,9 @@ def get_https_resource_securely(url, timeout=60, max_redirects=5, ssl_version=No
# }}} # }}}
def extract_tarball(raw, destdir): def extract_tarball(raw, destdir):
c = 'j' if raw.startswith(b'BZh') else 'J'
prints('Extracting application files...') prints('Extracting application files...')
with open('/dev/null', 'w') as null: with open('/dev/null', 'w') as null:
p = subprocess.Popen(['tar', 'x%sof' % c, '-', '-C', destdir], stdout=null, stdin=subprocess.PIPE, close_fds=True, p = subprocess.Popen(['tar', 'xJof', '-', '-C', destdir], stdout=null, stdin=subprocess.PIPE, close_fds=True,
preexec_fn=lambda: preexec_fn=lambda:
signal.signal(signal.SIGPIPE, signal.SIG_DFL)) signal.signal(signal.SIGPIPE, signal.SIG_DFL))
p.stdin.write(raw) p.stdin.write(raw)

2
setup/qt5-migrate.py
View File

@ -8,8 +8,6 @@ __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
# QT5XX: Get rid of the plugin porting stat collection in plugins_mirror.py # QT5XX: Get rid of the plugin porting stat collection in plugins_mirror.py
# QT5XX: Get rid of tarball compression type detection in linux-installer.py
# QT5XX: Delete this file after migration is completed # QT5XX: Delete this file after migration is completed
import os, re import os, re