From e0d26a15c326176e3a886da89bffda0722e8ea1b Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 14 Nov 2013 09:42:54 +0100
Subject: ship build_info: s/git rev-parse/git describe/

---
 ship/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ship/build')

diff --git a/ship/build b/ship/build
index bd26482d..95c14699 100755
--- a/ship/build
+++ b/ship/build
@@ -44,8 +44,8 @@ EOF
 build_info() { cat<<EOF
 $1a\\
 # this file was generated by //ship/build\\
-#   date: $(date -u --rfc-3339=s)\\
-#   version: $(git rev-parse HEAD)
+#   build date: $(date -u --rfc-3339=s)\\
+#   git describe: $(git describe --always --dirty --abbrev=0)
 EOF
 }
 
-- 
cgit v1.2.3


From babcdd4b4d203c98e3e2c7a5e70b9f1273b60f7c Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 14 Nov 2013 11:07:36 +0100
Subject: ship build: make sourceable

---
 ship/build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ship/build')

diff --git a/ship/build b/ship/build
index 95c14699..5863e325 100755
--- a/ship/build
+++ b/ship/build
@@ -181,4 +181,6 @@ buildcache_add() {
 ### main invocation
 ###
 
-build "$@"
+if echo "$0" | grep -q '^\(.*/\)\?build$'; then
+  build "$@"
+fi
-- 
cgit v1.2.3