summaryrefslogtreecommitdiffstats
path: root/tools/builder_defaults.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-25 09:46:57 -0300
committerRenato Botelho <renato@netgate.com>2015-08-25 14:49:55 -0300
commitd111360dfe961ae590f9f968bba2a171952be97c (patch)
tree0857739a5af0a2556e8663713e4f90ff41328a81 /tools/builder_defaults.sh
parentedef37f6da3228fccad951aa146de11c3b2bd278 (diff)
downloadpfsense-d111360dfe961ae590f9f968bba2a171952be97c.zip
pfsense-d111360dfe961ae590f9f968bba2a171952be97c.tar.gz
Detect current branch or tag
Diffstat (limited to 'tools/builder_defaults.sh')
-rw-r--r--tools/builder_defaults.sh8
1 files changed, 7 insertions, 1 deletions
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"}
OpenPOWER on IntegriCloud