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

Linux source install: Write path to bin dir into launcher scripts to make IPC more robust

Browse Source
This commit is contained in:
Kovid Goyal 2009-12-04 17:25:14 -07:00
parent 9a6754b01d
commit 90fb3e2108
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/install.py
View File

@ -26,6 +26,7 @@ sys.path.insert(0, path)
sys.resources_location = os.environ.get('CALIBRE_RESOURCES_PATH', {resources!r}) sys.resources_location = os.environ.get('CALIBRE_RESOURCES_PATH', {resources!r})
sys.extensions_location = os.environ.get('CALIBRE_EXTENSIONS_PATH', {extensions!r}) sys.extensions_location = os.environ.get('CALIBRE_EXTENSIONS_PATH', {extensions!r})
sys.executables_location = os.environ.get('CALIBRE_EXECUTABLES_PATH', {executables!r})
''' '''
@ -184,6 +185,7 @@ class Develop(Command):
script = template.format( script = template.format(
module=mod, func=func, module=mod, func=func,
path=self.libdir, resources=self.sharedir, path=self.libdir, resources=self.sharedir,
executables=self.staging_bindir,
extensions=self.j(self.libdir, 'calibre', 'plugins')) extensions=self.j(self.libdir, 'calibre', 'plugins'))
path = self.j(self.staging_bindir, name) path = self.j(self.staging_bindir, name)
if not os.path.exists(self.staging_bindir): if not os.path.exists(self.staging_bindir):

3
src/calibre/utils/ipc/launch.py
View File

@ -55,7 +55,8 @@ class Worker(object):
return os.path.join(contents, 'MacOS', self.osx_interpreter) return os.path.join(contents, 'MacOS', self.osx_interpreter)
return os.path.join(getattr(sys, 'frozen_path'), 'calibre-parallel') \ return os.path.join(getattr(sys, 'frozen_path'), 'calibre-parallel') \
if isfrozen else 'calibre-parallel' if isfrozen else \
os.path.join(sys.executables_location, 'calibre-parallel')
@property @property
def gui_executable(self): def gui_executable(self):