From e071cf9d298b18ddd80af57dccdf185f4561c0cd Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Wed, 14 Mar 2012 23:51:32 +0200 Subject: [PATCH] admin_rdma.sh: Use setlocalversion instead of git describe Signed-off-by: Vladimir Sokolovsky --- scripts/admin_rdma.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/admin_rdma.sh b/scripts/admin_rdma.sh index 82c5b4d..57a570d 100755 --- a/scripts/admin_rdma.sh +++ b/scripts/admin_rdma.sh @@ -371,7 +371,7 @@ done DIR="$PWD" cd $GIT_TREE -GIT_DESCRIBE=$(git describe) +GIT_DESCRIBE=$($DIR/scripts/setlocalversion $GIT_TREE) GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p') GIT_BRANCH=${GIT_BRANCH:-master} GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote) @@ -383,9 +383,9 @@ echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}" cd $DIR if [ -d ./.git ]; then if [[ ${POSTFIX_RELEASE_TAG} != "" ]]; then - echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > compat_version + echo -e "$(./scripts/setlocalversion)-${POSTFIX_RELEASE_TAG}" > compat_version else - echo -e "$(git describe)" > compat_version + echo -e "$(./scripts/setlocalversion)" > compat_version fi cd $GIT_TREE -- 2.41.0