diff options
| author | Przemyslaw Pawelczyk <przemoc@gmail.com> | 2015-12-01 01:44:21 +0100 |
|---|---|---|
| committer | Przemyslaw Pawelczyk <przemoc@gmail.com> | 2015-12-01 01:44:21 +0100 |
| commit | f27108a4b114c9d83de25d2beba5c7c0a1d1c20b (patch) | |
| tree | 9b63198c3b7cddb255dddc370821491a73fc788f | |
| parent | 3e572265776cac1ee01c27bb227d15becf4aa3d0 (diff) | |
Add action to show metastore version: -v / --version.
Fixes #36.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/metastore.c | 17 | ||||
| -rw-r--r-- | src/metastore.h | 1 | ||||
| -rwxr-xr-x | version.sh | 13 |
4 files changed, 32 insertions, 1 deletions
@@ -18,9 +18,11 @@ # Generic settings # PROJ_DIR := $(dir $(lastword $(MAKEFILE_LIST))) +METASTORE_VER := $(shell "$(PROJ_DIR)"/version.sh) CC = gcc CFLAGS += -g -Wall -pedantic -std=c99 -D_FILE_OFFSET_BITS=64 -O2 +CFLAGS += -DMETASTORE_VER="\"$(METASTORE_VER)\"" LDFLAGS += LIBS += -lbsd INCLUDES = diff --git a/src/metastore.c b/src/metastore.c index 2956cab..e245387 100644 --- a/src/metastore.c +++ b/src/metastore.c @@ -392,6 +392,15 @@ fixup_newemptydirs(void) } } +/* Outputs version information and exits */ +static void +version(void) +{ + msg(MSG_QUIET, "metastore %s\n", METASTORE_VER); + + exit(EXIT_SUCCESS); +} + /* Prints usage message and exits */ static void usage(const char *arg0, const char *message) @@ -409,6 +418,7 @@ usage(const char *arg0, const char *message) " -a, --apply Apply stored metadata\n" " -d, --dump Dump stored (if no PATH is given) or real metadata\n" " (if PATH is present, e.g. ./) in human-readable form\n" +" -V, --version Output version information and exit\n" " -h, --help Help message (this text)\n" "\n" "Valid OPTIONS are:\n" @@ -430,6 +440,7 @@ static struct option long_options[] = { { "save", no_argument, NULL, 's' }, { "apply", no_argument, NULL, 'a' }, { "dump", no_argument, NULL, 'd' }, + { "version", no_argument, NULL, 'V' }, { "help", no_argument, NULL, 'h' }, { "verbose", no_argument, NULL, 'v' }, { "quiet", no_argument, NULL, 'q' }, @@ -454,7 +465,7 @@ main(int argc, char **argv) i = 0; while (1) { int option_index = 0; - c = getopt_long(argc, argv, "csadhvqmeEgf:", + c = getopt_long(argc, argv, "csadVhvqmeEgf:", long_options, &option_index); if (c == -1) break; @@ -463,6 +474,7 @@ main(int argc, char **argv) case 's': /* save */ action |= ACTION_SAVE; i++; break; case 'a': /* apply */ action |= ACTION_APPLY; i++; break; case 'd': /* dump */ action |= ACTION_DUMP; i++; break; + case 'V': /* version */ action |= ACTION_VER; i++; break; case 'h': /* help */ action |= ACTION_HELP; i++; break; case 'v': /* verbose */ adjust_verbosity(1); break; case 'q': /* quiet */ adjust_verbosity(-1); break; @@ -489,6 +501,9 @@ main(int argc, char **argv) if (settings.do_removeemptydirs && action != ACTION_APPLY) usage(argv[0], "--remove-empty-dirs is only valid with --apply"); + if (action == ACTION_VER) + version(); + if (action == ACTION_HELP) usage(argv[0], NULL); diff --git a/src/metastore.h b/src/metastore.h index 384808d..1e1e436 100644 --- a/src/metastore.h +++ b/src/metastore.h @@ -34,6 +34,7 @@ #define ACTION_DIFF 0x02 #define ACTION_DUMP 0x04 #define ACTION_SAVE 0x10 +#define ACTION_VER 0x08 #define ACTION_HELP 0x80 /* Action masks */ diff --git a/version.sh b/version.sh new file mode 100755 index 0000000..6716dff --- /dev/null +++ b/version.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +METASTORE_PRETAG_VER=1.0.999 + +cd "${0%/*}" && \ +METASTORE_VER="$(\ +{ git describe --tags 2>/dev/null \ + || grep -no '^v[0-9][^ ]*' NEWS \ + || echo $METASTORE_PRETAG_VER; \ +} | sed '/^1:/s,,,;/:/{s,[^:]*:,,;s,$,+,};q' \ +)" + +echo "$METASTORE_VER_PREFIX$METASTORE_VER$METASTORE_VER_SUFFIX" |