Update cli usage hint and remove unnecessary description text

I don't know any cli tool that shows a description text
on the same line as the usage and sigrok-cli doesn't do it
either, so it shouldn't be there.
As I don't see any other place where it would make sense,
I remove it completely.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b18b81a7c4841b6edf937a91c13d1cf70f006f37..983dc537c3de4ba87cf718d52a589cd565060f75 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,6 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
 #-------------------------------------------------------------------------------
 
 set(PV_TITLE PulseView)
-set(PV_DESCRIPTION "A GUI for sigrok")
 set(PV_VERSION_STRING "0.4.0")
 
 set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION})

diff --git a/config.h.in b/config.h.in
index 8148ce1fade5f60989b00875f11b5ed8f296e55e..7720001a94861339fbfe0458f63c100cb405b1ac 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -22,7 +22,6 @@
 
 /* Application details */
 #define PV_TITLE "@PV_TITLE@"
-#define PV_DESCRIPTION "@PV_DESCRIPTION@"
 #define PV_BIN_NAME "@PROJECT_NAME@"
 
 /* Pulseview version information */

diff --git a/main.cpp b/main.cpp
index 91061ab788af38096ab7a92023c3bfd3d91a7e44..e5472c2a0b14e9eacf32d380223019dd007947a7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -58,7 +58,7 @@ void usage()
 {
        fprintf(stdout,
                "Usage:\n"
-               "  %s [OPTION...] - %s\n"
+               "  %s [OPTIONS] [FILE]\n"
                "\n"
                "Help Options:\n"
                "  -h, -?, --help                  Show help option\n"
@@ -69,7 +69,7 @@ void usage()
                "  -i, --input-file                Load input from file\n"
                "  -I, --input-format              Input format\n"
                "  -c, --clean                     Don't restore previous sessions on startup\n"
-               "\n", PV_BIN_NAME, PV_DESCRIPTION);
+               "\n", PV_BIN_NAME);
 }
 
 int main(int argc, char *argv[])