Merge lp:~nfultz/terminator/terminator into lp:terminator/trunk

[Neal Fultz]

This fixes https://bugs.launchpad.net/terminator/+bug/366644 by switching the -e and -x options when terminator is invoked as x-terminal-emulator.

This is my first bug fix on launchpad :)

[Stephen Boddy (stephen-j-boddy)]

Hi Neal. First, thanks for the contribution. Unfortunately I won't apply this as is. My main issue is that you are changing the behaviour of -x too, by making it refuse arguments. The standard x terminal only has -e, so -x behaviour is not relevant to it. Gnome Terminal does not modify -x behaviour in the wrapper script available. So right now your patch adds more alternative behaviour. I'd be accepting of something that did what the Gnome Terminal wrapper script does (although obviously not in Perl ;-) Either a Python rewrite or integrated into the main terminator script.

Last (minor) point, we don't typically use camel case in the coding of Terminator, so is_X_terminal_emulator rather than isXTerminalEmulator.

review: Needs Fixing

[lp:~nfultz/terminator/terminator]

1417. By Neal Fultz <nfultz@neal-1015pe> on 2013-08-04

Bug 366644 / Don't modify -x when invoked as x-terminal-emulator

[Neal Fultz (nfultz)]

OK, pushed a fix; it's a little uglier, though. Just to be explicit,
there are four cases, one of them is supposed to fail:

./terminator -e man htop

terminator: error: Additional unexpected arguments found: ['htop']

./terminator -x man htop

works

./x-terminal-emulator -e man htop

works

./x-terminal-emulator -x man htop

works

On Sun, Aug 04, 2013 at 04:10:33PM -0000, Stephen Boddy wrote:
> Review: Needs Fixing
>
> Hi Neal. First, thanks for the contribution. Unfortunately I won't apply this as is. My main issue is that you are changing the behaviour of -x too, by making it refuse arguments. The standard x terminal only has -e, so -x behaviour is not relevant to it. Gnome Terminal does not modify -x behaviour in the wrapper script available. So right now your patch adds more alternative behaviour. I'd be accepting of something that did what the Gnome Terminal wrapper script does (although obviously not in Perl ;-) Either a Python rewrite or integrated into the main terminator script.
>
> Last (minor) point, we don't typically use camel case in the coding of Terminator, so is_X_terminal_emulator rather than isXTerminalEmulator.
>
>
> --
> https://code.launchpad.net/~nfultz/terminator/terminator/+merge/163457
> You are the owner of lp:~nfultz/terminator/terminator.

=== modified file 'terminatorlib/optionparse.py'
--- terminatorlib/optionparse.py	2013-01-30 13:17:11 +0000
+++ terminatorlib/optionparse.py	2013-08-04 19:43:25 +0000
@@ -42,6 +42,8 @@
     """Parse the command line options"""
     usage = "usage: %prog [options]"
 
+    is_X_terminal_emulator = os.path.basename(sys.argv[0]) == 'x-terminal-emulator'
+
     parser = OptionParser(usage)
 
     parser.add_option('-v', '--version', action='store_true', dest='version',
@@ -59,8 +61,18 @@
     parser.add_option('--geometry', dest='geometry', type='string', 
                       help=_('Set the preferred size and position of the window'
                              '(see X man page)'))
-    parser.add_option('-e', '--command', dest='command', 
-            help=_('Specify a command to execute inside the terminal'))
+
+    if not is_X_terminal_emulator :
+        parser.add_option('-e', '--command', dest='command', 
+                help=_('Specify a command to execute inside the terminal'))
+    else :
+        parser.add_option('--command', dest='command', 
+                help=_('Specify a command to execute inside the terminal'))
+        parser.add_option('-e', '--execute2', dest='execute', action='callback',
+                callback=execute_cb, 
+                help=_('Use the rest of the command line as a command to  '
+                       'execute inside the terminal, and its arguments'))
+
     parser.add_option('-g', '--config', dest='config', 
                       help=_('Specify a config file'))
     parser.add_option('-x', '--execute', dest='execute', action='callback',