Fixed code review findings + upgrade to lttng-tools 2.0-pre20

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / control / service / CommandShell.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandShell.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandShell.java
index eb26530315d99534fd93c79bdac9a288dca32d5f..e4afc611f150f4ad2870d6ab5f77a2480ab4efb7 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandShell.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/service/CommandShell.java
@@ -211,8 +211,10 @@ public class CommandShell implements ICommandShell {
         if (cmd == null || cmd.equals("")) //$NON-NLS-1$
             return cmd;
         StringBuffer formattedCommand = new StringBuffer();
-//        formattedCommand.append(cmd).append(CMD_DELIMITER);
-        formattedCommand.append(cmd).append("\\\r;"); //$NON-NLS-1$
+        // Make a multi line command by using \ and \r. This is needed for matching
+        // the DONE_MARKUP_STRING in echoed command when having a long command 
+        // (bigger than max SSH line)
+        formattedCommand.append(cmd).append("\\\r;"); //$NON-NLS-1$ 
         formattedCommand.append(SHELL_ECHO_CMD).append(DONE_MARKUP_STRING);
         formattedCommand.append(" $?"); //$NON-NLS-1$
         formattedCommand.append(CMD_DELIMITER);