quote $@ to avoid splitting on whitespace in bash; related to #300

bio-guoda · Oct 2, 2024 · d226274 · d226274
1 parent bc774b5
commit d226274
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/preston-cli/src/main/deb/bin/preston b/preston-cli/src/main/deb/bin/preston
@@ -3,4 +3,4 @@
 # Launches Preston in JVM
 #
 
-java -Xmx4G -XX:+UseG1GC -cp "/usr/share/preston/lib/*" bio.guoda.preston.Preston $@
+java -Xmx4G -XX:+UseG1GC -cp "/usr/share/preston/lib/*" bio.guoda.preston.Preston "$@"
diff --git a/preston-cli/src/test/java/bio/guoda/preston/PrestonTest.java b/preston-cli/src/test/java/bio/guoda/preston/PrestonTest.java
@@ -1,6 +1,7 @@
 package bio.guoda.preston;
 
 import bio.guoda.preston.cmd.CmdHistory;
+import bio.guoda.preston.cmd.CmdTrack;
 import org.junit.Test;
 import picocli.CommandLine;
 
@@ -24,6 +25,22 @@ public void parseRemotesWithCommas() {
         assertTwoRemotes(parseResult);
     }
 
+    @Test
+    public void parseMessagePhrase() {
+        CommandLine commandLine = Preston.getCommandLine();
+        CommandLine.ParseResult parseResult = commandLine.parseArgs("track",
+                "--message",
+                "hello world");
+        assertThat(parseResult, is(notNullValue()));
+
+        CommandLine.ParseResult subcommand = parseResult.subcommand();
+        Object o = subcommand.commandSpec().userObject();
+        assertTrue(o instanceof CmdTrack);
+        CmdTrack cmd = (CmdTrack) o;
+
+        assertThat(cmd.getActivityDescription(), is("hello world"));
+    }
+
     @Test
     public void parseRemotes() {
         CommandLine commandLine = Preston.getCommandLine();

diff --git a/preston-track/src/main/java/bio/guoda/preston/cmd/CmdActivity.java b/preston-track/src/main/java/bio/guoda/preston/cmd/CmdActivity.java
@@ -39,10 +39,10 @@ public abstract class CmdActivity extends LoggingPersisting implements Runnable
 
     @CommandLine.Option(
             names = {"-m", "--message"},
-            split = " ",
+            arity = "1..*",
             description = "Custom description of this tracking activity or command. (default: \"${DEFAULT-VALUE}\")"
     )
-    private List<String> description = Arrays.asList(getDescriptionDefault());
+    private String description = getDescriptionDefault();
 
     public abstract String getDescriptionDefault();
 
@@ -172,7 +172,7 @@ static List<Quad> findActivityInfo(ActivityContext activity) {
     }
 
     public String getActivityDescription() {
-        return StringUtils.join(description, " ");
+        return description;
     }
 
     private static class LoggerExitHook extends Thread {