From: Bernhard Urban <lewurm@gmx.net>
Date: Sun, 31 Jan 2010 00:06:10 +0000 (+0100)
Subject: added version option
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=pyfrprog.git;a=commitdiff_plain;h=31898950d88ea5a8565c83126b0f02a63cbbbc3a

added version option
---

diff --git a/Makefile b/Makefile
index 9f3c3b9..43ae795 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ all:
 
 #install: all #this just work when $FUJDEV is set for root too, eh?
 install:
-	sed -e 's/%PREFIX%/\$(PREFIX)/g' frprog.py > $(PREFIX)/bin/frprog
+	sed -e 's/%PREFIX%/\$(PREFIX)/g' frprog.py | sed -e 's/%VERSION%/$(shell git describe --abbrev=6)/g'> $(PREFIX)/bin/frprog
 	cp SerialPort_linux.pyc $(PREFIX)/bin/SerialPort_linux.pyc
 	mkdir -p $(PREFIX)/share/frprog/
 	cp pkernel/pkernel.mhx $(PREFIX)/share/frprog/pkernel.mhx
diff --git a/frprog.py b/frprog.py
index ab8aba6..d99f48f 100755
--- a/frprog.py
+++ b/frprog.py
@@ -181,6 +181,11 @@ def main(argv=None):
 	# check command line arguments
 	if argv is None:
 		argv = sys.argv
+
+	if len(argv) == 2 and (argv[1] == "-v" or argv[1] == "--version"):
+		print "Version: %VERSION%"
+		return 0
+
 	if len(argv) != 2 and len(argv) != 4:
 		print "Usage: " + argv[0] + " <target mhx-file> [-d DEVICE]"
 		return 1