osx: rm dependency on viewer launch script
use /usr/bin/open instead of script
This commit is contained in:
parent
deded91a1b
commit
8e79a3d118
3
.gitignore
vendored
3
.gitignore
vendored
@ -8,7 +8,7 @@
|
|||||||
# Build byproducts
|
# Build byproducts
|
||||||
/build
|
/build
|
||||||
/config.log
|
/config.log
|
||||||
/package.txt
|
/package*.txt
|
||||||
/fah/FAHControl_glade.py
|
/fah/FAHControl_glade.py
|
||||||
/fah/Version.py
|
/fah/Version.py
|
||||||
/FAHControl.egg-info
|
/FAHControl.egg-info
|
||||||
@ -16,6 +16,7 @@
|
|||||||
/dist
|
/dist
|
||||||
/version.txt
|
/version.txt
|
||||||
/FAHControl*.tar.gz
|
/FAHControl*.tar.gz
|
||||||
|
/fahcontrol*.pkg
|
||||||
|
|
||||||
# Temporary files
|
# Temporary files
|
||||||
*~
|
*~
|
||||||
|
@ -1295,6 +1295,9 @@ class FAHControl(SingleAppServer):
|
|||||||
|
|
||||||
def viewer_check(self):
|
def viewer_check(self):
|
||||||
if self.viewer is not None and self.viewer.poll() is not None:
|
if self.viewer is not None and self.viewer.poll() is not None:
|
||||||
|
if self.viewer.returncode and sys.platform == 'darwin':
|
||||||
|
self.error('Failed to launch viewer:\n\n' +
|
||||||
|
self.viewer.stderr.read())
|
||||||
self.viewer = None # Viewer exited
|
self.viewer = None # Viewer exited
|
||||||
|
|
||||||
|
|
||||||
@ -1324,6 +1327,9 @@ class FAHControl(SingleAppServer):
|
|||||||
|
|
||||||
if not (len(cmd) and len(cmd[0])): cmd = ['FAHViewer']
|
if not (len(cmd) and len(cmd[0])): cmd = ['FAHViewer']
|
||||||
|
|
||||||
|
if sys.platform == 'darwin':
|
||||||
|
cmd = ['/usr/bin/open', '-a', cmd[0], '--args'] + cmd[1:]
|
||||||
|
|
||||||
if fullscreen: cmd.append('--fullscreen')
|
if fullscreen: cmd.append('--fullscreen')
|
||||||
cmd.append('--width=' + width)
|
cmd.append('--width=' + width)
|
||||||
cmd.append('--height=' + height)
|
cmd.append('--height=' + height)
|
||||||
@ -1345,7 +1351,11 @@ class FAHControl(SingleAppServer):
|
|||||||
if debug: print cmd
|
if debug: print cmd
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.viewer = subprocess.Popen(cmd, cwd = get_home_dir())
|
if sys.platform == 'darwin':
|
||||||
|
self.viewer = subprocess.Popen(cmd, cwd = get_home_dir(),
|
||||||
|
bufsize = 4096, stderr=subprocess.PIPE)
|
||||||
|
else:
|
||||||
|
self.viewer = subprocess.Popen(cmd, cwd = get_home_dir())
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
self.error('Failed to launch viewer with command:\n\n' +
|
self.error('Failed to launch viewer with command:\n\n' +
|
||||||
' '.join(cmd))
|
' '.join(cmd))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user