From 4da4ce50191c72267e1746aaced08e2890ebde89 Mon Sep 17 00:00:00 2001
From: Alex Kan <29241719+akan72@users.noreply.github.com>
Date: Sat, 15 Aug 2026 08:46:47 -0400
Subject: [PATCH] feat: install pinned Google Cloud CLI

---
 assimilate.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
 zshrc         | 17 +++++++++++------
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/assimilate.sh b/assimilate.sh
index 43b5a88..f2837bb 100755
--- a/assimilate.sh
+++ b/assimilate.sh
@@ -162,6 +162,50 @@ if [ -n "$DELTA_TARGET" ] && { [ ! -x "$DELTA_BIN" ] || [ "$("$DELTA_BIN" --vers
   rm -rf "$tmp"
 fi
 
+# Install a pinned Google Cloud CLI archive without modifying shell profiles.
+# zshrc sources the SDK's path and completion files from this location.
+GCLOUD_VERSION=577.0.0
+GCLOUD_DIR="$HOME/.local/share/google-cloud-sdk"
+
+if ! command -v gcloud >/dev/null 2>&1 && [ ! -x "$GCLOUD_DIR/bin/gcloud" ]; then
+  case "$OS-$ARCH" in
+    Darwin-arm64)
+      GCLOUD_TARGET=darwin-arm
+      GCLOUD_SHA256=5ed8f9176eca367c6849fea10fde8e27d9a7d00a221c67f895c3020b8cf45a42
+      ;;
+    Darwin-x86_64)
+      GCLOUD_TARGET=darwin-x86_64
+      GCLOUD_SHA256=6e54ae17d744fc8ca12ac69886c880bd2b164141179f6a8a9d3acc53e6b5d3e8
+      ;;
+    Linux-aarch64|Linux-arm64)
+      GCLOUD_TARGET=linux-arm
+      GCLOUD_SHA256=dbac26bdf80d72b5d13538e3a215dcbfe2781edfd2d69723effbeef3839cffb8
+      ;;
+    Linux-x86_64)
+      GCLOUD_TARGET=linux-x86_64
+      GCLOUD_SHA256=0b32d330446ce7b0f57f253e7efab4636c18fb1f87a3ac31c6c3f2a2a697525e
+      ;;
+    *)
+      echo "WARN: no Google Cloud CLI archive pinned for $OS-$ARCH — skipping installation" >&2
+      GCLOUD_TARGET=""
+      ;;
+  esac
+
+  if [ -n "$GCLOUD_TARGET" ]; then
+    tmp=$(mktemp -d)
+    GCLOUD_ARCHIVE="google-cloud-cli-${GCLOUD_VERSION}-${GCLOUD_TARGET}.tar.gz"
+    curl -fsSL "https://storage.googleapis.com/cloud-sdk-release/$GCLOUD_ARCHIVE" -o "$tmp/$GCLOUD_ARCHIVE"
+    if command -v sha256sum >/dev/null; then
+      echo "${GCLOUD_SHA256}  $tmp/$GCLOUD_ARCHIVE" | sha256sum -c -
+    else
+      echo "${GCLOUD_SHA256}  $tmp/$GCLOUD_ARCHIVE" | shasum -a 256 -c -
+    fi
+    mkdir -p "$HOME/.local/share"
+    tar -xzf "$tmp/$GCLOUD_ARCHIVE" -C "$HOME/.local/share"
+    rm -rf "$tmp"
+  fi
+fi
+
 # Install tmux plugin manager and plugins declared in tmux.conf
 clone_pinned https://github.com/tmux-plugins/tpm     "$HOME/.tmux/plugins/tpm"            7bdb7ca33c9cc6440a600202b50142f401b6fe21  # v3.1.0
 clone_pinned https://github.com/erikw/tmux-powerline "$HOME/.tmux/plugins/tmux-powerline" 6079ace8d534a01d4d964b8b854b223f72edaf4b  # v3.2.0
diff --git a/zshrc b/zshrc
index aea3ca7..634c578 100644
--- a/zshrc
+++ b/zshrc
@@ -62,12 +62,6 @@ export NVM_DIR="$HOME/.nvm"
 [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"
 alias snowsql=/Applications/SnowSQL.app/Contents/MacOS/snowsql
 
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f "$HOME/Downloads/google-cloud-sdk/path.zsh.inc" ]; then . "$HOME/Downloads/google-cloud-sdk/path.zsh.inc"; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f "$HOME/Downloads/google-cloud-sdk/completion.zsh.inc" ]; then . "$HOME/Downloads/google-cloud-sdk/completion.zsh.inc"; fi
-
 # .zsh syntax highlighting (installed via brew on macOS, may be missing elsewhere)
 if [ -f /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
   source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
@@ -94,3 +88,14 @@ precmd_functions+=(_reset_cursor)
 # bun
 export BUN_INSTALL="$HOME/.bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
+
+# Load the Google Cloud SDK installed by assimilate.sh, or an existing SDK.
+_gcloud_sdk_root="$HOME/.local/share/google-cloud-sdk"
+if [ ! -d "$_gcloud_sdk_root" ] && (( $+commands[gcloud] )); then
+  _gcloud_sdk_root="${commands[gcloud]:A:h:h}"
+elif [ ! -d "$_gcloud_sdk_root" ] && [ -d "$HOME/work/dev/google-cloud-sdk" ]; then
+  _gcloud_sdk_root="$HOME/work/dev/google-cloud-sdk"
+fi
+[ -f "$_gcloud_sdk_root/path.zsh.inc" ] && source "$_gcloud_sdk_root/path.zsh.inc"
+[ -f "$_gcloud_sdk_root/completion.zsh.inc" ] && source "$_gcloud_sdk_root/completion.zsh.inc"
+unset _gcloud_sdk_root