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

Launching GUI from Terminal now works correctly in OS X

Browse Source
This commit is contained in:
Kovid Goyal 2009-06-06 10:27:57 -07:00
parent 2c39eda812
commit d6e4ce275f
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
installer/osx/freeze.py
View File

@ -31,6 +31,7 @@ resources_dir = os.path.join(base_dir, 'Resources')
frameworks_dir = os.path.join(base_dir, 'Frameworks')
base_name = os.path.splitext(name)[0]
python = os.path.join(base_dir, 'MacOS', 'python')
qt_plugins = os.path.join(os.path.realpath(base_dir), 'MacOS')
loader_path = os.path.join(dirpath, base_name+'.py')
loader = open(loader_path, 'w')
site_packages = glob.glob(resources_dir+'/lib/python*/site-packages.zip')[0]
@ -46,9 +47,10 @@ print >>loader, '%(function)s()'
loader.close()
os.chmod(loader_path, 0700)
os.environ['PYTHONHOME'] = resources_dir
os.environ['FC_CONFIG_DIR'] = os.path.join(resources_dir, 'fonts')
os.environ['FONTCONFIG_PATH'] = os.path.join(resources_dir, 'fonts')
os.environ['MAGICK_HOME'] = os.path.join(frameworks_dir, 'ImageMagick')
os.environ['DYLD_LIBRARY_PATH'] = os.path.join(frameworks_dir, 'ImageMagick', 'lib')
os.environ['QT_PLUGIN_PATH'] = qt_plugins
args = [path, loader_path] + sys.argv[1:]
os.execv(python, args)
'''
@ -259,19 +261,11 @@ _check_symlinks_prescript()
dest = os.path.join(frameworks_dir, os.path.basename(f))
if os.path.exists(dest):
os.remove(dest)
os.link(f, dest)
shutil.copyfile(f, dest)
dst = os.path.join(resource_dir, 'fonts')
if os.path.exists(dst):
shutil.rmtree(dst)
shutil.copytree('/usr/local/etc/fonts', dst, symlinks=False)
for x in os.listdir('/usr/local/etc/fonts'):
dst = os.path.join(frameworks_dir, x)
y = os.path.join('/usr/local/etc/fonts', x)
if os.path.isdir(dst):
if os.path.exists(dst): shutil.rmtree(dst)
shutil.copytree(y, dst)
else:
os.link(y, dst)
print
print 'Adding IPython'

2
src/calibre/devices/usbms/device.py
View File

@ -504,7 +504,7 @@ class Device(DeviceConfig, DevicePlugin):
def do_it(drives):
for d in drives:
try:
winutil.eject_drive(d)
winutil.eject_drive(bytes(d)[0])
except:
pass

2
src/calibre/ebooks/epub/input.py
View File

@ -28,7 +28,7 @@ class EPUBInput(InputFormatPlugin):
f.write(raw[1024:])
@classmethod
def process_ecryption(cls, encfile, opf, log):
def process_encryption(cls, encfile, opf, log):
key = None
m = re.search(r'(?i)(urn:uuid:[0-9a-f-]+)', open(opf, 'rb').read())
if m:

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

@ -108,6 +108,11 @@ class Worker(object):
self._env['PYTHONHOME'] = resources
self._env['MAGICK_HOME'] = os.path.join(fd, 'ImageMagick')
self._env['DYLD_LIBRARY_PATH'] = os.path.join(fd, 'ImageMagick', 'lib')
self._env['FONTCONFIG_PATH'] = \
os.path.join(os.path.realpath(resources), 'fonts')
self._env['QT_PLUGIN_PATH'] = \
os.path.join(self.osx_contents_dir, 'MacOS')
if isfrozen and not (iswindows or isosx):
self._env['LD_LIBRARY_PATH'] = getattr(sys, 'frozen_path') + ':'\
+ os.environ.get('LD_LIBRARY_PATH', '')