X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=scripts%2Fversion.sh;h=80d104103caf27def442801311a788bccdec3174;hb=e5b9965c183e761aefadcb975930449bcb4ab6eb;hp=2c89a4688a39eed730ad76ed98743dc13e2bc6f4;hpb=47eee099004d00d92c35820f844fb51975ea3dfb;p=kconfig-frontends

diff --git a/scripts/version.sh b/scripts/version.sh
index 2c89a46..80d1041 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -14,10 +14,11 @@ if [ ${plain} -ne 0 -a ${internal} -ne 0 ]; then
     exit 1
 fi
 
-k_ver="$(  head -n 1 .version |cut -d ' ' -f 1  )"
-k_cset="$( head -n 1 .version |cut -d ' ' -f 2  )"
-k_name="$( head -n 1 .version |cut -d ' ' -f 3- )"
-kf_ver="$( tail -n 1 .version                   )"
+ver_file="${0%/*}/../.version"
+k_ver="$(  head -n 1 "${ver_file}" |cut -d ' ' -f 1  )"
+k_cset="$( head -n 1 "${ver_file}" |cut -d ' ' -f 2  )"
+k_name="$( head -n 1 "${ver_file}" |cut -d ' ' -f 3- )"
+kf_ver="$( tail -n 1 "${ver_file}"                   )"
 
 if [ ${internal} -ne 0 ]; then
     printf "%s\n" "${kf_ver}"
@@ -28,15 +29,15 @@ k_ver_plain="$( printf "%s" "${k_ver}"  \
                 |sed -r -e 's/-rc.*//;' )"
 
 case "${kf_ver}" in
-    hg) kf_ver="hg_$( hg id -i -r . )"
-        k_ver_extra="$( printf "_%-7.7s" "${k_cset}" )"
-        ;;
-    *)  k_ver_extra="";;
+    git) kf_ver="-$( git rev-parse --short HEAD )"
+         k_ver_extra="$( printf "_%-7.7s" "${k_cset}" )"
+         ;;
+    *)   k_ver_extra="";;
 esac
 
 if [ "${plain}" -eq 1 ]; then
     echo "${k_ver_plain}"
 else
-    echo "${k_ver}${k_ver_extra}-${kf_ver}"
+    echo "${k_ver}${k_ver_extra}.${kf_ver}"
 fi