provide a way to override cipd root for *nix systems.

So that it allows depot tools has the ability to write the cipd pkgs
outside of the repo.

windows support will be added in a follow-up change.

Bug: 355430412
Change-Id: I7fabed7ecac8216ba3f3f639217d9e36746241f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5742434
Reviewed-by: Gregory Guterman <guterman@google.com>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>

bb

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/bb" "$@"
+exec "$CIPD_ROOT/bb" "$@"

cipd_bin_setup.sh

@@ -15,10 +15,18 @@ function cipd_bin_setup {
         ;;
     esac
 
+    # value in .cipd_client_root file overrides the default root.
+    CIPD_ROOT_OVERRIDE_FILE="${MYPATH}/.cipd_client_root"
+    if [ -f "${CIPD_ROOT_OVERRIDE_FILE}" ]; then
+        ROOT=$(<"${CIPD_ROOT_OVERRIDE_FILE}")
+    fi
+
     (
     source "$MYPATH/cipd" ensure \
         -log-level warning \
         -ensure-file "$ENSURE" \
         -root "$ROOT"
     )
+
+    echo $ROOT
 }

dirmd

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/dirmd" "$@"
+exec "$CIPD_ROOT/dirmd" "$@"

git-credential-luci

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/git-credential-luci" "$@"
+exec "$CIPD_ROOT/git-credential-luci" "$@"

led

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/led" "$@"
+exec "$CIPD_ROOT/led" "$@"

luci-auth

@@ -9,7 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
-
-exec "$MYPATH/.cipd_bin/luci-auth" "$@"
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
+exec "$CIPD_ROOT/luci-auth" "$@"

lucicfg

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/lucicfg" "$@"
+exec "$CIPD_ROOT/lucicfg" "$@"

mac_toolchain

@@ -7,6 +7,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/mac_toolchain" "$@"
+exec "$CIPD_ROOT/mac_toolchain" "$@"

pinpoint

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/pinpoint" "$@"
+exec "$CIPD_ROOT/pinpoint" "$@"

prpc

@@ -9,7 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
-
-exec "$MYPATH/.cipd_bin/prpc" "$@"
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
+exec "$CIPD_ROOT/prpc" "$@"

rdb

@@ -9,6 +9,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
-exec "$MYPATH/.cipd_bin/rdb" "$@"
+exec "$CIPD_ROOT/rdb" "$@"

vpython3

@@ -38,7 +38,7 @@ export DEPOT_TOOLS_DIR="${DEPOT_TOOLS_DIR:-$(dirname "$0")}"
 export DEPOT_TOOLS_UNAME_S="${DEPOT_TOOLS_UNAME_S:-$(uname -s | tr '[:upper:]' '[:lower:]')}"
 
 source "${DEPOT_TOOLS_DIR}/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+CIPD_ROOT=$(cipd_bin_setup) &> /dev/null
 
 # Don't pass this to the Python script as it might turn around and run commands
 # in other depot_tools dirs.
@@ -49,6 +49,6 @@ mingw*|cygwin*)
   cmd.exe //c $0.bat "$@"
   ;;
 *)
-  exec "${base_dir}/.cipd_bin/vpython3" "$@"
+  exec "$CIPD_ROOT/vpython3" "$@"
   ;;
 esac