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

Dont rely on the shell to restart calibre on macOS

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-20 14:14:10 +05:30
parent b657ba60d7
commit 1a53ef945a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/main.py
View File

@ -364,10 +364,6 @@ def run_in_debug_mode():
stderr=subprocess.STDOUT, stdin=lopen(os.devnull, 'rb')) stderr=subprocess.STDOUT, stdin=lopen(os.devnull, 'rb'))
def shellquote(s):
return "'" + s.replace("'", "'\\''") + "'"
def run_gui(opts, args, listener, app, gui_debug=None): def run_gui(opts, args, listener, app, gui_debug=None):
si = singleinstance('db') si = singleinstance('db')
if not si: if not si:
@ -400,12 +396,13 @@ def run_gui(opts, args, listener, app, gui_debug=None):
if getattr(runner.main, 'debug_on_restart', False) or gui_debug is not None: if getattr(runner.main, 'debug_on_restart', False) or gui_debug is not None:
run_in_debug_mode() run_in_debug_mode()
else: else:
import subprocess
if hasattr(sys, 'frameworks_dir'): if hasattr(sys, 'frameworks_dir'):
app = os.path.dirname(os.path.dirname(os.path.realpath(sys.frameworks_dir))) app = os.path.dirname(os.path.dirname(os.path.realpath(sys.frameworks_dir)))
from calibre.debug import run_calibre_debug
prints('Restarting with:', app) prints('Restarting with:', app)
subprocess.Popen('sleep 3s; open ' + shellquote(app), shell=True) run_calibre_debug('-c', 'import sys, os, time; time.sleep(3); os.execlp("open", sys.argv[-1])', app)
else: else:
import subprocess
os.environ['CALIBRE_RESTARTING_FROM_GUI'] = environ_item('1') os.environ['CALIBRE_RESTARTING_FROM_GUI'] = environ_item('1')
if iswindows and hasattr(winutil, 'prepare_for_restart'): if iswindows and hasattr(winutil, 'prepare_for_restart'):
winutil.prepare_for_restart() winutil.prepare_for_restart()