Simplify util_clip_region()

[geeqie.git] / version.sh

diff --git a/version.sh b/version.sh
index 94912c7..772aada 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -3,7 +3,7 @@
 ## @file
 ## @brief Generate the Geeqie version number
 ##
-## This script is called from configure.ac
+## This script is called from meson.build
 ##
 ## If the current branch is "master" a revison number is generated of the form:  
 ## <n.m>+git<date of last commit>-<last commit hash>  
@@ -18,7 +18,7 @@
 ## Geeqie <n.m[.p]>
 ##
 
-if [ -d .git ]
+if [ -d .git ] && [ -x "$(command -v git)" ]
 then
        branch=$(git rev-parse --abbrev-ref HEAD)
 
@@ -32,7 +32,7 @@ then
                minor_version=$2
 #              patch_version=$3  # not used on master branch
 
-               printf '%s%s%s%s%s%s%s' "$major_version" "." "$minor_version" "+git" $(git log --max-count=1 --date=format:"%Y%m%d" --format="%ad") "-" $(git rev-parse --quiet --verify --short HEAD)
+               printf '%s%s%s%s%s%s%s' "$major_version" "." "$minor_version" "+git" "$(git log --max-count=1 --date=format:"%Y%m%d" --format="%ad")" "-" "$(git rev-parse --quiet --verify --short HEAD)"
        else
                version=$(head -1 NEWS)
                # shellcheck disable=SC2086