Merge branch 'get_version' of https://github.com/anwa/etckeeper

2 files changed, 11 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 5d19a3e..c95d51a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,11 @@ INSTALL_EXE=${INSTALL}
 INSTALL_DATA=${INSTALL} -m 0644
 PYTHON=python
 
-build: etckeeper.spec
+build: etckeeper.spec etckeeper.version
 	-$(PYTHON) ./etckeeper-bzr/__init__.py build || echo "** bzr support not built"
 	-$(PYTHON) ./etckeeper-dnf/etckeeper.py build || echo "** DNF support not built"
 
-install:
+install: etckeeper.version
 	mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/
 	$(CP) *.d $(DESTDIR)$(etcdir)/etckeeper/
 	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
@@ -55,11 +55,15 @@ endif
 	-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
 	echo "** installation successful"
 
-clean: etckeeper.spec
+clean: etckeeper.spec etckeeper.version
 	rm -rf build
 
 etckeeper.spec:
 	sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" etckeeper.spec
 	rm -f etckeeper.spec~
 
-.PHONY: etckeeper.spec
+etckeeper.version:
+	sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)\"/" etckeeper
+	rm -f etckeeper~
+
+.PHONY: etckeeper.spec etckeeper.version
diff --git a/etckeeper b/etckeeper
index 554ada9..0aa79ac 100755
--- a/etckeeper
+++ b/etckeeper
@@ -64,6 +64,9 @@ if [ -z "$1" ]; then
 elif [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ]; then
 	man etckeeper || echo "Usage: etckeeper command [-d directory]" >&2
 	exit 0
+elif [ "x$1" = "x-v" ] || [ "x$1" = "x--version" ]; then
+        echo "Version: 1.17"
+        exit 0
 fi
 command="$1"
 shift 1