From 9332cb697e2681dd550f23cc8e8c1be5da2768c1 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 28 Jan 2016 13:10:01 -0800
Subject: [PATCH] release_util: use BOTO_PATH instead of searching for .boto

This simplifies the code a little and allows BOTO_PATH or BOTO_CONFIG to
be set in the environment. Now configs may be in arbitrary locations.
---
 build_library/release_util.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/build_library/release_util.sh b/build_library/release_util.sh
index 1afb1b7f90..db32cd12c1 100644
--- a/build_library/release_util.sh
+++ b/build_library/release_util.sh
@@ -56,17 +56,10 @@ check_gsutil_opts() {
         UPLOAD_PATH="${FLAGS_upload_path%%/}"
     fi
 
-    # Search for .boto, may be run via sudo
-    local boto
-    for boto in "$HOME/.boto" "/home/$SUDO_USER/.boto"; do
-        if [[ -f "$boto" ]]; then
-            info "Using boto config $boto"
-            export BOTO_CONFIG="$boto"
-            break
-        fi
-    done
-    if [[ ! -f "$BOTO_CONFIG" ]]; then
-        die_notrace "Please run gsutil config to create ~/.boto"
+    # Ensure scripts run via sudo can use the user's gsutil/boto configuration.
+    if [[ -n "${SUDO_USER}" ]]; then
+        : ${BOTO_PATH:="$HOME/.boto:/home/$SUDO_USER/.boto"}
+        export BOTO_PATH
     fi
 }