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

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-24 13:45:18 +05:30
parent a004fca78e
commit 5807e56bde
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup/linux-installer.py
View File

@ -311,7 +311,7 @@ def download_tarball():
os.remove(dest) os.remove(dest)
try: try:
with open(cached_sigf, 'wb') as f: with open(cached_sigf, 'wb') as f:
f.write(signature) f.write(bytes(signature))
except IOError as e: except IOError as e:
if e.errno != errno.EACCES: if e.errno != errno.EACCES:
raise raise
@ -617,12 +617,8 @@ def check_version():
if calibre_version == '%version': if calibre_version == '%version':
calibre_version = urllib.urlopen('http://status.calibre-ebook.com/latest').read() calibre_version = urllib.urlopen('http://status.calibre-ebook.com/latest').read()
def main(bin_dir=None, share_dir=None, isolated=False): def main(install_dir=None, isolated=False, bin_dir=None, share_dir=None):
defdir = '/opt' destdir = os.path.abspath(install_dir or '/opt')
destdir = os.environ.get('INSTALL_DIR', None)
if not destdir:
destdir = defdir
destdir = os.path.abspath(destdir)
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='')
prints('a location like /opt or /usr/local') prints('a location like /opt or /usr/local')
@ -655,5 +651,4 @@ except NameError:
from_file = False from_file = False
if __name__ == '__main__' and from_file: if __name__ == '__main__' and from_file:
# wget -nv -O- https://github.com/kovidgoyal/calibre/raw/master/setup/linux-installer.py | sudo INSTALL_DIR=/opt python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()" # noqa
main() main()