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

Always spawn commands via a shell, similar to xterm. This makes terminator -e "/bin/bash -c /usr/bin/python" work. 

This also makes things like -e "cd $HOME && bash" work; the shell does it for us.  In this respect we are at least better than gnome-terminal.

This has the "disadvantage" that if you don't set $SHELL and don't have a known shell installed, your custom command will no longer save you.  Also if you have a $SHELL which doesn't support -c 'command', it breaks.  These users deserve their pain.

Resolves lp#247330, I think.
This commit is contained in:
Thomas Hurst 2008-07-16 23:13:54 +01:00
parent 09b3f25283
commit 15ba71d766
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
terminatorlib/terminatorterm.py
View File

@ -371,12 +371,10 @@ text/plain
if self.command: if self.command:
dbg ('spawn_child: using self.command: %s'%self.command) dbg ('spawn_child: using self.command: %s'%self.command)
args = self.command args = ['-c'] + self.command
shell = self.command[0]
elif self.conf.use_custom_command: elif self.conf.use_custom_command:
dbg ('spawn_child: using custom command: %s'%self.conf.custom_command) dbg ('spawn_child: using custom command: %s'%self.conf.custom_command)
args = self.conf.custom_command.split () args = ['-c'] + self.conf.custom_command
shell = args[0]
try: try:
if os.environ['PATH'] == "": if os.environ['PATH'] == "":
@ -386,17 +384,9 @@ text/plain
paths = ['/usr/local/bin', '/usr/bin', '/bin'] paths = ['/usr/local/bin', '/usr/bin', '/bin']
dbg ('spawn_child: found paths: "%s"'%paths) dbg ('spawn_child: found paths: "%s"'%paths)
if self.conf.use_custom_command and shell[0] != '/': if True or not self.command and not os.path.exists (shell):
for path in paths:
dbg ('spawn_child: looking for pathless custom command "%s"'%os.path.join (path, shell))
if os.path.exists (os.path.join (path, shell)):
shell = os.path.join (path, shell)
break
if not self.command and not os.path.exists (shell):
dbg ('spawn_child: hunting for a command') dbg ('spawn_child: hunting for a command')
shell = os.getenv ('SHELL') or '' shell = os.getenv ('SHELL') or ''
args = []
if not os.path.exists (shell): if not os.path.exists (shell):
dbg ('spawn_child: No usable shell in $SHELL (%s)'%os.getenv('SHELL')) dbg ('spawn_child: No usable shell in $SHELL (%s)'%os.getenv('SHELL'))
shell = pwd.getpwuid (os.getuid ())[6] or '' shell = pwd.getpwuid (os.getuid ())[6] or ''
@ -420,11 +410,10 @@ text/plain
gobject.timeout_add (100, self.terminator.closeterm, self) gobject.timeout_add (100, self.terminator.closeterm, self)
return (-1) return (-1)
if not args:
args.append (shell)
if self.conf.login_shell: if self.conf.login_shell:
args[0] = "-%s"%args[0] args.insert(0, "-" + shell)
else:
args.insert(0, shell)
dbg ('SEGBUG: Setting WINDOWID') dbg ('SEGBUG: Setting WINDOWID')
os.putenv ('WINDOWID', '%s'%self._vte.get_parent_window().xid) os.putenv ('WINDOWID', '%s'%self._vte.get_parent_window().xid)