SSHUploader: if verbose, prints the actual command run on the remote board

Federico Fissore · Federico Fissore · commit f16bbaa91d9d · 2015-06-19T17:44:28.000+02:00
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
@@ -157,8 +157,11 @@ private boolean runUploadTool(SSH ssh, PreferencesMap prefs) throws Exception {
     }
 
     String pattern = prefs.getOrExcept("upload.pattern");
-    String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
-    return ssh.execSyncCommand(StringUtils.join(cmd, " "), System.out, System.err);
+    String command = StringUtils.join(StringReplacer.formatAndSplit(pattern, prefs, true), " ");
+    if (verbose) {
+      System.out.println(command);
+    }
+    return ssh.execSyncCommand(command, System.out, System.err);
   }
 
   private void scpFiles(SCP scp, SSH ssh, File sourcePath, File sketch, List<String> warningsAccumulator) throws JSchException, IOException {

Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,11 @@ private boolean runUploadTool(SSH ssh, PreferencesMap prefs) throws Exception {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`String pattern = prefs.getOrExcept("upload.pattern");`
`160`		`- String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);`
`161`		`- return ssh.execSyncCommand(StringUtils.join(cmd, " "), System.out, System.err);`
	`160`	`+ String command = StringUtils.join(StringReplacer.formatAndSplit(pattern, prefs, true), " ");`
	`161`	`+ if (verbose) {`
	`162`	`+ System.out.println(command);`
	`163`	`+ }`
	`164`	`+ return ssh.execSyncCommand(command, System.out, System.err);`
`162`	`165`	`}`
`163`	`166`
`164`	`167`	`private void scpFiles(SCP scp, SSH ssh, File sourcePath, File sketch, List<String> warningsAccumulator) throws JSchException, IOException {`