Change meaning of -v flag from --version to --verbose

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index d60ef3ad275fcdccdc5358da942e295cc34f7c57..fabca9d4f87d82b94a4713c07f24da0e2e64d68a 100644 (file)
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -31,10 +31,10 @@ In daemon mode messages are continuously received.
 *-h*, *--help*::
 Show help message and quit.
 
 *-h*, *--help*::
 Show help message and quit.
 

-*-v*, *--version*::
+*--version*::

 Print the version and quit.
 
 Print the version and quit.
 

-*--verbose*::
+*-v*, *--verbose*::

 Raise log level and include lib signal logs.
 
 *--log-file* LOG_FILE::
 Raise log level and include lib signal logs.
 
 *--log-file* LOG_FILE::

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 91af270d7cb38e7bff1f74ffcc60827fcf8d6ea4..4daaa815cb706679dd3b9c6de139bf00df900d50 100644 (file)
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -64,8 +64,8 @@ public class App {
                 .description("Commandline interface for Signal.")
                 .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
 
                 .description("Commandline interface for Signal.")
                 .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
 

-        parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
-        parser.addArgument("--verbose")
+        parser.addArgument("--version").help("Show package version.").action(Arguments.version());
+        parser.addArgument("-v", "--verbose")

                 .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
                 .action(Arguments.count());
         parser.addArgument("--log-file")
                 .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
                 .action(Arguments.count());
         parser.addArgument("--log-file")

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 14bdc4c92ded097bb296eeaf4e1b493fd0971f49..3da4fbcba6459e2628d687d8e6d240c8bf4c33e9 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -80,7 +80,7 @@ public class Main {
                 .includeArgumentNamesAsKeysInResult(true)
                 .build()
                 .defaultHelp(false);
                 .includeArgumentNamesAsKeysInResult(true)
                 .build()
                 .defaultHelp(false);

-        parser.addArgument("--verbose").action(Arguments.count());
+        parser.addArgument("-v", "--verbose").action(Arguments.count());

         parser.addArgument("--log-file").type(File.class);
 
         try {
         parser.addArgument("--log-file").type(File.class);
 
         try {