Simplify util_clip_region()

[geeqie.git] / version.sh

diff --git a/version.sh b/version.sh
index fb52741..772aada 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 ## @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,31 +18,31 @@
 ## Geeqie <n.m[.p]>
 ##
 
-if [ -d .git ]
+if [ -d .git ] && [ -x "$(command -v git)" ]
 then
        branch=$(git rev-parse --abbrev-ref HEAD)
 
-       if [ "$branch" == "master" ]
+       if [ "$branch" = "master" ]
        then
-               IFS=$'.'
-# shellcheck disable=SC2046
+               IFS='.'
+               # shellcheck disable=SC2046
                set -- $(git tag --list v[1-9]* | tail -n 1 | tr -d 'v')
 
                major_version=$1
                minor_version=$2
 #              patch_version=$3  # not used on master branch
 
-               echo "$major_version" && echo "." && echo "$minor_version" && echo "+git" && git log --max-count=1 --date=format:"%Y%m%d" --format="%ad" && echo "-" && 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
+               # shellcheck disable=SC2086
                set -- $version
-               echo "$2"
+               printf '%s' "$2"
        fi
 else
        version=$(head -1 NEWS)
-# shellcheck disable=SC2086
+       # shellcheck disable=SC2086
        set -- $version
-       echo "$2"
+       printf '%s' "$2"
 fi