luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Dont override set but null vars

This commit is contained in:
Matt Keeler 2018-06-18 09:15:01 -04:00
parent f6d1aa8fc3
commit ade900f2b6
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build-support/functions/00-vars.sh
View File

@ -7,11 +7,7 @@ UI_LEGACY_BUILD_CONTAINER_DEFAULT="consul-build-ui-legacy"
GO_BUILD_CONTAINER_DEFAULT="consul-build-go" GO_BUILD_CONTAINER_DEFAULT="consul-build-go"
# Whether to colorize shell output # Whether to colorize shell output
if test -z "${COLORIZE}" COLORIZE=${COLORIZE-1}
then
COLORIZE=1
fi
# determine GOPATH and the first GOPATH to use for intalling binaries # determine GOPATH and the first GOPATH to use for intalling binaries
GOPATH=${GOPATH:-$(go env GOPATH)} GOPATH=${GOPATH:-$(go env GOPATH)}
@ -22,24 +18,14 @@ case $(uname) in
esac esac
MAIN_GOPATH=$(cut -d: -f1 <<< "${GOPATH}") MAIN_GOPATH=$(cut -d: -f1 <<< "${GOPATH}")
# Build debugging output is off by default # Build debugging output is off by default
if test -z "${BUILD_DEBUG}" BUILD_DEBUG=${BUILD_DEBUG-0}
then
BUILD_DEBUG=0
fi
# default publish host is github.com - only really useful to use something else for testing # default publish host is github.com - only really useful to use something else for testing
if test -z "${PUBLISH_GIT_HOST}" PUBLISH_GIT_HOST="${PUBLISH_GIT_HOST-github.com}"
then
PUBLISH_GIT_HOST=github.com
fi
# default publish repo is hashicorp/consul - useful to override for testing as well as in the enterprise repo # default publish repo is hashicorp/consul - useful to override for testing as well as in the enterprise repo
if test -z "${PUBLISH_GIT_REPO}" PUBLISH_GIT_REPO="${PUBLISH_GIT_REPO-hashicorp/consul.git}"
then
PUBLISH_GIT_REPO=hashicorp/consul.git
fi
if test "$(uname)" == "Darwin" if test "$(uname)" == "Darwin"
then then
@ -47,4 +33,3 @@ then
else else
SED_EXT="" SED_EXT=""
fi fi