Merge lp:~xanderfomin/pantheon-terminal/fix-1324577 into lp:~elementary-apps/pantheon-terminal/trunk

[Alexander Fomin]

There was a problem in process_argv() method for commands that consist from one string, because in the latter case (bin_path + " " + tmp[1]).split(" ") returns [bin_path, ""] array, but not [bin_path] which is expected.

[lp:~xanderfomin/pantheon-terminal/fix-1324577]

577. By Alexander Fomin on 2014-05-31

Code style fixed

[Sergey "Shnatsel" Davidoff (shnatsel)]

This indeed does fix the bug. Thanks!

However, the code written before you came around looks superfluous to me. Now that you've tracked down the cause of the bug, I'll see if I can rewrite it better.

[Sergey "Shnatsel" Davidoff (shnatsel)]

I'm marking this merge request "Rejected" because https://code.launchpad.net/~elementary-apps/pantheon-terminal/fix-1324577-with-cleanup/+merge/222077 based on this work was merged.

Thanks again for fixing the bug!

[Alexander Fomin (xanderfomin)]

That's OK.

Unmerged revisions

577. By Alexander Fomin on 2014-05-31

Code style fixed

576. By Alexander Fomin on 2014-05-31

Command execution via "--execute" fixed

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2014-05-19 20:00:57 +0000
+++ src/TerminalWidget.vala	2014-05-31 16:06:15 +0000
@@ -404,10 +404,14 @@
             string[] tmp = path.split (" ", 2);
             string? bin_path = GLib.Environment.find_program_in_path (tmp[0]);
             if (path != null) {
-                return (bin_path + " " + tmp[1]).split (" ");
+                if (tmp.length == 1) {
+                    return { bin_path };
+                } else {
+                    return (bin_path + " " + tmp[1]).split (" ");
+                }
             } else {
                 return null;
             }
         }
     }
-}
\ No newline at end of file
+}