mpbb: Don't hardcode jobs tools location

The location of the jobs tools is used in a couple of places, so
don't repeat ourselves.

git-svn-id: https://svn.macports.org/repository/macports/contrib/mp-buildbot@152531 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Lawrence Velázquez
2016-09-12 01:59:10 +00:00
parent 771368f2d2
commit 24c603886e
3 changed files with 4 additions and 3 deletions
+1
View File
@@ -119,6 +119,7 @@ parseopt prefix:,work-dir: "$@" || exit
# shellcheck disable=SC2034 disable=SC2154
# Not really options, but pretend they are because they're global.
option_jobs_dir=${option_work_dir}/tools
option_log_dir=${option_work_dir}/logs
# shellcheck disable=SC2086
+1 -1
View File
@@ -95,7 +95,7 @@ checkout() {
# shellcheck disable=SC2100 disable=SC2154
if svn=${option_svn:-$(command -v svn)}; then
checkout=svn-checkout
jobs_dir=${option_work_dir}/tools
jobs_dir=${option_jobs_dir}
if [[ -n ${option_svn_url+_} ]]; then
: "${option_jobs_url=${option_svn_url}/base/portmgr/jobs}"
: "${option_ports_url=${option_svn_url}/dports}"
+2 -2
View File
@@ -56,9 +56,9 @@ gather-archives() {
archive_basename=$(basename "${archive_path}")
if ! curl -fIsL "${option_archive_site}/${archive_port}/${archive_basename}" > /dev/null; then
# $option_work_dir is set in mpbb
# $option_jobs_dir is set in mpbb
# shellcheck disable=SC2154
if "${tclsh}" "${option_work_dir}/tools/port_binary_distributable.tcl" -v "${archive_port}"; then
if "${tclsh}" "${option_jobs_dir}/port_binary_distributable.tcl" -v "${archive_port}"; then
echo "Staging archive for upload: ${archive_basename}"
mkdir -p "${option_staging_dir}/${archive_port}" || { status=$?; break; }
ln "${archive_path}" "${option_staging_dir}/${archive_port}/${archive_basename}" || { status=$?; break; }