From f34809a65327138de394332dd748b3ae43508047 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 13 Feb 2019 17:51:32 +0100 Subject: get-version.sh: Fallback to version.txt if not a git repo --- .gitignore | 4 +++- get-version.sh | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99e89ee..38ae262 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ build/ .project *.swp .autotools -.idea \ No newline at end of file +.idea +/version.txt + diff --git a/get-version.sh b/get-version.sh index 000137c..1d4a8cb 100755 --- a/get-version.sh +++ b/get-version.sh @@ -7,7 +7,16 @@ SELF="$(readlink -f "${ARG0}")" ROOT_DIR="$(dirname "${SELF}")" cd "$ROOT_DIR" -[ -n "$(git diff)" ] && MODDED='+MOD' +if [ -d .git ]; then + [ -n "$(git diff)" ] && MODDED='+MOD' + echo $(git describe)$MODDED, branch $(git rev-parse --abbrev-ref HEAD), built "$(date +%Y-%m-%d)" + exit 0 +fi -echo $(git describe)$MODDED, branch $(git rev-parse --abbrev-ref HEAD), built "$(date +%Y-%m-%d)" +if [ -f "version.txt" ]; then + cat "version.txt" + exit 0 +fi + +echo "-unknown-" -- cgit v1.2.3-55-g7522