diff options
author | Renato Botelho <renato@netgate.com> | 2015-08-25 09:14:05 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-08-25 14:49:54 -0300 |
commit | 0ce2a7f3aa600cd04d791e0c1689295353e6e173 (patch) | |
tree | 9d2fbd19eaf433d5bcecbbd7001a8b1620539f04 /tools/builder_defaults.sh | |
parent | 78b0f246af03e56a4a8c244c7f2dde574d0ee250 (diff) | |
download | pfsense-0ce2a7f3aa600cd04d791e0c1689295353e6e173.zip pfsense-0ce2a7f3aa600cd04d791e0c1689295353e6e173.tar.gz |
Rename BUILDER_SCRIPTS to BUILDER_TOOLS that makes more sense on current infrastructure, also remove some cd calls
Diffstat (limited to 'tools/builder_defaults.sh')
-rw-r--r-- | tools/builder_defaults.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index a01b31d..12a8333 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -61,10 +61,10 @@ local _curdir=$(basename $(dirname ${0})) if [ "${_curdir}" = "tools" ]; then - export BUILDER_SCRIPTS=$(realpath ${_curdir}) + export BUILDER_TOOLS=$(realpath ${_curdir}) export BUILDER_ROOT=$(realpath "${_curdir}/..") else - export BUILDER_SCRIPTS=$(realpath "${_curdir}/tools") + export BUILDER_TOOLS=$(realpath "${_curdir}/tools") export BUILDER_ROOT=$(realpath "${_curdir}") fi @@ -127,7 +127,7 @@ export ZFS_TANK=${ZFS_TANK:-"tank"} export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}} -export POUDRIERE_BULK=${POUDRIERE_BULK:-${BUILDER_SCRIPTS}/conf/pfPorts/poudriere_bulk} +export POUDRIERE_BULK=${POUDRIERE_BULK:-${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk} export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"git@git.pfmechanics.com:pfsense/freebsd-ports.git"} export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} |