Use dest argument as folder in any case (#543)

The instrument goal accepts folders as well as files as input. In case
of files the instrumented copy should be written to the folder given as
the dest option.

1 files changed, 7 insertions, 2 deletions

diff --git a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java
index c52c0722..bb3a8ff6 100644
--- a/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java
+++ b/org.jacoco.cli/src/org/jacoco/cli/internal/commands/Instrument.java
@@ -49,14 +49,19 @@ public class Instrument extends Command {
 	@Override
 	public int execute(final PrintWriter out, final PrintWriter err)
 			throws IOException {
+		final File absoluteDest = dest.getAbsoluteFile();
 		instrumenter = new Instrumenter(
 				new OfflineInstrumentationAccessGenerator());
 		int total = 0;
 		for (final File s : source) {
-			total += instrumentRecursive(s, dest);
+			if (s.isFile()) {
+				total += instrument(s, new File(absoluteDest, s.getName()));
+			} else {
+				total += instrumentRecursive(s, absoluteDest);
+			}
 		}
 		out.printf("[INFO] %s classes instrumented to %s.%n",
-				Integer.valueOf(total), dest.getAbsolutePath());
+				Integer.valueOf(total), absoluteDest);
 		return 0;
 	}