itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Thomas Meire's cwd patch so it's clear that it's OS specific, choose a default cwd. LP #181194

This commit is contained in:
Chris Jones 2008-02-25 00:00:10 +00:00
parent 67fd877d11
commit 2ee1943b4c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
terminator
View File

@ -18,7 +18,7 @@
"""Terminator by Chris Jones <cmsj@tenshu.net>""" """Terminator by Chris Jones <cmsj@tenshu.net>"""
# import standard python libs # import standard python libs
import os, sys, string, time, math import os, platform, sys, string, time, math
from optparse import OptionParser from optparse import OptionParser
import gettext import gettext
@ -111,8 +111,6 @@ class TerminatorTerm:
self.gconf_client = gconf.client_get_default () self.gconf_client = gconf.client_get_default ()
self.command = command self.command = command
# Open first tab in ~ or in cwd from parent?
#self.cwd = cwd or os.path.expanduser ("~");
self.cwd = cwd or os.getcwd(); self.cwd = cwd or os.getcwd();
if profile == None: if profile == None:
@ -206,10 +204,17 @@ class TerminatorTerm:
def get_cwd (self): def get_cwd (self):
""" Return the current working directory of the subprocess. """ Return the current working directory of the subprocess.
This function is NOT portable, as it relies on a *nix-specific This function requires OS specific behaviours
path. This won't work on Windows.
""" """
return os.path.realpath("/proc/%s/cwd" % self._pid) system = platform.system ()
if system == 'Linux':
cwd = os.path.realpath ('/proc/%s/cwd' % self._pid)
else:
# We don't have a child cwd getter for this platform, so let
# TerminatorTerm use its default
cwd = None
return (cwd)
def reconf (self, property): def reconf (self, property):
value = self.gconf_client.get ('%s/%s'%(self.profile, property)) value = self.gconf_client.get ('%s/%s'%(self.profile, property))