From d111360dfe961ae590f9f968bba2a171952be97c Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 25 Aug 2015 09:46:57 -0300 Subject: Detect current branch or tag --- tools/builder_defaults.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index ea44bb3..cca9438 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -115,7 +115,13 @@ if [ -z "${PRODUCT_VERSION}" ]; then fi # Product repository tag to build -export GIT_REPO_BRANCH_OR_TAG=${GIT_REPO_BRANCH_OR_TAG:-master} +local _cur_git_repo_branch_or_tag=$(git -C ${BUILDER_ROOT} rev-parse --abbrev-ref HEAD) +if [ "${_cur_git_repo_branch_or_tag}" = "HEAD" ]; then + # We are on a tag, lets find out its name + export GIT_REPO_BRANCH_OR_TAG=$(git -C ${BUILDER_ROOT} describe --tags) +else + export GIT_REPO_BRANCH_OR_TAG="${_cur_git_repo_branch_or_tag}" +fi # Directory to be used for writing temporary information export SCRATCHDIR=${SCRATCHDIR:-"${BUILDER_ROOT}/tmp"} -- cgit v1.1