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

[Sergey "Shnatsel" Davidoff]

Fix bug #1324577 by dropping the custom argv parser and replacing it with Glib's Shell.parse_argv()
Also drop support for executing shell commands because hardcoding BASH is no longer acceptable.

This work is based on ~xanderfomin's research and https://code.launchpad.net/~xanderfomin/pantheon-terminal/fix-1324577/+merge/221611

[Alexander Fomin (xanderfomin)]

Works OK for me.

review: Approve

[David Gomes (davidgomes)]

If it works for you then I don't have to test it, I approve the code. Thanks for testing mate.

review: Approve

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2014-05-19 20:00:57 +0000
+++ src/TerminalWidget.vala	2014-06-04 16:58:13 +0000
@@ -251,17 +251,13 @@
             }
         }
 
-        public void run_program (string program) {
-            string dir = GLib.Environment.get_current_dir ();
-            string[]? program_with_args = process_argv (program);
-
+        public void run_program (string program_string) {
             try {
-                if (program_with_args != null)
-                    this.fork_command_full (Vte.PtyFlags.DEFAULT, dir, program_with_args,
-                                            null, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
-                else
-                    this.fork_command_full (Vte.PtyFlags.DEFAULT, dir, ("bash -c " + program).split (" "),
-                                            null, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
+                string[]? program_with_args = null;
+                Shell.parse_argv (program_string, out program_with_args);
+
+                this.fork_command_full (Vte.PtyFlags.DEFAULT, null, program_with_args,
+                                        null, SpawnFlags.SEARCH_PATH, null, out this.child_pid);
             } catch (Error e) {
                 warning (e.message);
             }
@@ -393,21 +389,5 @@
                     break;
             }
         }
-
-        private string[]? process_argv (string path) {
-            /* example of the code below.
-              pantheon-terminal -e "sudo apt-get update"
-              tmp[0] == "sudo"
-              tmp[1] == "apt-get update"
-            */
-
-            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 (" ");
-            } else {
-                return null;
-            }
-        }
     }
 }
\ No newline at end of file