git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] do not cat version file if it does not exist
@ 2006-02-03 10:11 Amos Waterland
  0 siblings, 0 replies; only message in thread
From: Amos Waterland @ 2006-02-03 10:11 UTC (permalink / raw)
  To: junkio; +Cc: git

The build process currently produces this ugly message:

 $ make
 cat: version: No such file or directory
 GIT_VERSION = 1.1.GIT
 cat: version: No such file or directory

This patch make GIT-VERSION-GEN check that a file named `version' exists
before trying to cat it.

Signed-off-by: Amos Waterland <apw@us.ibm.com>

---

 GIT-VERSION-GEN |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

applies-to: 2b022b9b34b375afff456e7527a3d89a56ce8abf
eff0a8f6c905b3112538f30fb5a9ce09d4e18e72
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 72201be..fbaa397 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -7,8 +7,10 @@ DEF_VER=v1.1.GIT
 # (included in release tarballs), then default
 if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
+elif test -f version; then
+	VN=$(cat version);
 else
-	VN=$(cat version) || VN="$DEF_VER"
+	VN="$DEF_VER";
 fi
 
 VN=$(expr "$VN" : v*'\(.*\)')
---
0.99.9.GIT

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2006-02-03 10:12 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-03 10:11 [PATCH] do not cat version file if it does not exist Amos Waterland

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).