Make /etc/make.tinderbox.private.conf the place to set BTI and PROXY settings.

Make bti in bashrc use the TINDERBOX_PROXY variable rather than BTI_PROXY,
and also set curl (with proxy) for fetch and resume.

Note: don't set the proxy in the environment or the isolation will fail;
unfortunately wget can be told to ignore proxies but _not_ to use them, on
the command line, which is why we went with curl.

2 files changed, 6 insertions, 1 deletions

diff --git a/bashrc b/bashrc
index 6bd6a38..94096b7 100755
--- a/bashrc
+++ b/bashrc
@@ -17,7 +17,7 @@
 # SOFTWARE.
 
 dent_me() {
-    echo "$@" | bti ${BTI_PROXY:+--proxy "${BTI_PROXY}"} --host "${BTI_HOST}" --account "${BTI_ACCOUNT}" --password "${BTI_PASSWORD}" >/dev/null
+    echo "$@" | bti ${TINDERBOX_PROXY:+--proxy "${TINDERBOX_PROXY}"} --host "${BTI_HOST}" --account "${BTI_ACCOUNT}" --password "${BTI_PASSWORD}" >/dev/null
 }
 
 metadata_print() {
diff --git a/tinderbox.make.conf b/tinderbox.make.conf
index dd20717..7dedf5b 100644
--- a/tinderbox.make.conf
+++ b/tinderbox.make.conf
@@ -14,6 +14,11 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+source /etc/make.tinderbox.private.conf
+
+FETCHCOMMAND="/usr/bin/curl --location ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} --output \${DISTDIR}/\${FILE} \${URI}"
+RESUMECOMMAND="/usr/bin/curl --location ${TINDERBOX_PROXY+--proxy ${TINDERBOX_PROXY}} --continue-at - --output \${DISTDIR}/\${FILE} \${URI}"
+
 FEATURES="test test-fail-continue -unmerge-logs split-log userpriv usersandbox compress-build-logs -preserve-libs"
 
 ACCEPT_LICENSE="*"