Add git commit id to the version if it's not a tag

[lttng-tools.git] / src / bin / lttng / commands / version.c

diff --git a/src/bin/lttng/commands/version.c b/src/bin/lttng/commands/version.c
index a6bbd6aece3c7a9e674705ddda560dd4bcd0e39b..f2f435e4bf4c84fa6912450d252595633968d585 100644 (file)
--- a/src/bin/lttng/commands/version.c
+++ b/src/bin/lttng/commands/version.c
@@ -44,8 +44,9 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-       fprintf(ofp, "usage: lttng version\n");
+       fprintf(ofp, "usage: lttng version [OPTIONS]\n");
        fprintf(ofp, "\n");
+       fprintf(ofp, "Options:\n");
        fprintf(ofp, "  -h, --help               Show this help\n");
        fprintf(ofp, "      --list-options       Simple listing of options\n");
        fprintf(ofp, "\n");
@@ -77,8 +78,9 @@ int cmd_version(int argc, const char **argv)
                }
        }
 
-       MSG("lttng version " VERSION " - " VERSION_NAME);
-       MSG("Web site: http://lttng.org/");
+       MSG("lttng version " FULL_VERSION " - " VERSION_NAME);
+       MSG("\n" VERSION_DESCRIPTION "\n");
+       MSG("Web site: http://lttng.org");
        MSG("\nlttng is free software and under the GPL license and part LGPL");
 
 end: