From f438372616b90f40c2fc64da5d80f497ef27a99f Mon Sep 17 00:00:00 2001
From: Johnny Kuan <jkuan@ece.ubc.ca>
Date: Thu, 15 Sep 2011 23:20:50 -0700
Subject: [PATCH 1/4] add version and help options

---
 autojump | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/autojump b/autojump
index 46bd8da..d17d2f3 100755
--- a/autojump
+++ b/autojump
@@ -31,6 +31,7 @@ from sys import argv, stderr, version_info, exit
 from tempfile import NamedTemporaryFile
 from operator import itemgetter
 import os
+AUTOJUMP_VERSION = "release v17"
 MAX_KEYWEIGHT = 1000
 MAX_STORED_PATHS = 600
 COMPLETION_SEPARATOR = '__'
@@ -156,7 +157,7 @@ def shell_utility():
     """Run this when autojump is called as a shell utility"""
     try:
         optlist, args = getopt.getopt(argv[1:], 'a',
-                ['stat', 'import', 'completion', 'bash']) 
+                ['stat', 'import', 'completion', 'bash', 'version', 'help'])
     except getopt.GetoptError as ex:
         print("Unknown command line argument: %s" % ex)
         exit(1)
@@ -176,6 +177,11 @@ def shell_utility():
             print("%.1f:\t%s" % (count, path))
         print("Total key weight: %d. Number of stored paths: %d" %
                 (sum(path_dict.values()), len(paths)))
+    elif ('--version', '') in optlist:
+        print("autojump %s" % AUTOJUMP_VERSION)
+    elif ('--help', '') in optlist:
+        print("usage: j <dirspec>")
+        print("where dirspec is a few characters of the directory you want to jump to.")
     else:
         import re
         completion = False

From 12bf584088dc597c34590511bdfb9ce796493554 Mon Sep 17 00:00:00 2001
From: Johnny Kuan <jkuan@ece.ubc.ca>
Date: Thu, 15 Sep 2011 23:21:35 -0700
Subject: [PATCH 2/4] change version to git revision when installing

---
 git-version.sh | 11 +++++++++++
 install.sh     |  3 +++
 install.zsh    |  3 +++
 3 files changed, 17 insertions(+)
 create mode 100755 git-version.sh

diff --git a/git-version.sh b/git-version.sh
new file mode 100755
index 0000000..2744110
--- /dev/null
+++ b/git-version.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# add git revision to autojump
+gitrevision=`git rev-parse HEAD`
+if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+    gitrevision=$gitrevision"-dirty"
+fi
+sed -e "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"git revision $gitrevision\"/" autojump > autojump-version
+mv -f autojump-version autojump
+chmod a+rw autojump
+
+
diff --git a/install.sh b/install.sh
index 58e0644..649ae9e 100755
--- a/install.sh
+++ b/install.sh
@@ -40,6 +40,9 @@ done
 
 echo "Installing to ${prefix} ..."
 
+# add git revision to autojump
+./git-revision.sh
+
 # INSTALL AUTOJUMP
 sudo mkdir -p ${prefix}/share/autojump/
 sudo mkdir -p ${prefix}/bin/
diff --git a/install.zsh b/install.zsh
index f372054..1a90cf0 100755
--- a/install.zsh
+++ b/install.zsh
@@ -39,6 +39,9 @@ done
 
 echo "Installing main files to ${prefix} ..."
 
+# add git revision to autojump
+./git-revision.sh
+
 sudo mkdir -p ${prefix}/share/autojump/
 sudo mkdir -p ${prefix}/bin/
 sudo mkdir -p ${prefix}/share/man/man1/

From f75b11d143db43a899979882e5e4b7d6ff3a183a Mon Sep 17 00:00:00 2001
From: Johnny Kuan <jkuan@ece.ubc.ca>
Date: Thu, 15 Sep 2011 23:35:20 -0700
Subject: [PATCH 3/4] fix typo in installers

---
 install.sh  | 2 +-
 install.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 649ae9e..f9a37ef 100755
--- a/install.sh
+++ b/install.sh
@@ -41,7 +41,7 @@ done
 echo "Installing to ${prefix} ..."
 
 # add git revision to autojump
-./git-revision.sh
+./git-version.sh
 
 # INSTALL AUTOJUMP
 sudo mkdir -p ${prefix}/share/autojump/
diff --git a/install.zsh b/install.zsh
index 1a90cf0..2a8d1e8 100755
--- a/install.zsh
+++ b/install.zsh
@@ -40,7 +40,7 @@ done
 echo "Installing main files to ${prefix} ..."
 
 # add git revision to autojump
-./git-revision.sh
+./git-version.sh
 
 sudo mkdir -p ${prefix}/share/autojump/
 sudo mkdir -p ${prefix}/bin/

From 2350da51e5a9e476e5df9986a26823e19740ca52 Mon Sep 17 00:00:00 2001
From: Johnny Kuan <jkuan@ece.ubc.ca>
Date: Thu, 22 Sep 2011 02:06:08 -0700
Subject: [PATCH 4/4] use git describe instead of rev-parse

---
 git-version.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/git-version.sh b/git-version.sh
index 2744110..725f241 100755
--- a/git-version.sh
+++ b/git-version.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 # add git revision to autojump
-gitrevision=`git rev-parse HEAD`
+gitrevision=`git describe`
 if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
     gitrevision=$gitrevision"-dirty"
 fi
 sed -e "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"git revision $gitrevision\"/" autojump > autojump-version
 mv -f autojump-version autojump
 chmod a+rw autojump
-
-