mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-07 09:01:38 -04:00
Linux installer; Fix completion for ebook-convert not working. Fixes #967834 (calibre-complete not functioning)
This commit is contained in:
parent
23739e7dec
commit
3aaf5fb857
@ -242,6 +242,10 @@ class PostInstall:
|
|||||||
if not os.path.exists(os.path.dirname(f)):
|
if not os.path.exists(os.path.dirname(f)):
|
||||||
os.makedirs(os.path.dirname(f))
|
os.makedirs(os.path.dirname(f))
|
||||||
self.manifest.append(f)
|
self.manifest.append(f)
|
||||||
|
complete = 'calibre-complete'
|
||||||
|
if getattr(sys, 'frozen_path'):
|
||||||
|
complete = os.path.join(getattr(sys, 'frozen_path'), complete)
|
||||||
|
|
||||||
self.info('Installing bash completion to', f)
|
self.info('Installing bash completion to', f)
|
||||||
with open(f, 'wb') as f:
|
with open(f, 'wb') as f:
|
||||||
f.write('# calibre Bash Shell Completion\n')
|
f.write('# calibre Bash Shell Completion\n')
|
||||||
@ -326,8 +330,8 @@ class PostInstall:
|
|||||||
}
|
}
|
||||||
complete -o nospace -F _ebook_device ebook-device
|
complete -o nospace -F _ebook_device ebook-device
|
||||||
|
|
||||||
complete -o nospace -C calibre-complete ebook-convert
|
complete -o nospace -C %s ebook-convert
|
||||||
'''))
|
''')%complete)
|
||||||
except TypeError as err:
|
except TypeError as err:
|
||||||
if 'resolve_entities' in str(err):
|
if 'resolve_entities' in str(err):
|
||||||
print 'You need python-lxml >= 2.0.5 for calibre'
|
print 'You need python-lxml >= 2.0.5 for calibre'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user