install.sh: use ARCH for terraform zip/logging per review\n\nCo-authored-by: sreya <4856196+sreya@users.noreply.github.com>

sreya · blink-so[bot] · commit 53f07421d566 · 2025-08-24T23:11:26.000Z
diff --git a/install.sh b/install.sh
@@ -278,7 +278,6 @@ main() {
 	if [ "${TRACE-}" ]; then
 		set -x
 	fi
-
 	unset \
 		DRY_RUN \
 		METHOD \
@@ -288,16 +287,13 @@ main() {
 		RSH \
 		WITH_TERRAFORM \
 		CAP_NET_ADMIN
-
 	ALL_FLAGS=""
-
 	while [ "$#" -gt 0 ]; do
 		case "$1" in
 		-*)
 			ALL_FLAGS="${ALL_FLAGS} $1"
 			;;
 		esac
-
 		case "$1" in
 		--dry-run)
 			DRY_RUN=1
@@ -364,7 +360,6 @@ main() {
 			;;
 		--)
 			shift
-			# We remove the -- added above.
 			ALL_FLAGS="${ALL_FLAGS% --}"
 			RSH_ARGS="$*"
 			break
@@ -379,46 +374,26 @@ main() {
 			break
 			;;
 		esac
-
 		shift
 	done
-
 	if [ "${RSH_ARGS-}" ]; then
 		RSH="${RSH-ssh}"
 		echoh "Installing remotely with $RSH $RSH_ARGS"
 		curl -fsSL https://coder.com/install.sh | prefix "$RSH_ARGS" "$RSH" "$RSH_ARGS" sh -s -- "$ALL_FLAGS"
 		return
 	fi
-
-	# These can be overridden for testing but shouldn't normally be used as it can
-	# result in a broken coder.
 	OS=${OS:-$(os)}
 	ARCH=${ARCH:-$(arch)}
 	TERRAFORM_ARCH=${TERRAFORM_ARCH:-$(terraform_arch)}
-
-	# If we've been provided a flag which is specific to the standalone installation
-	# method, we should "detect" standalone to be the appropriate installation method.
-	# This check needs to occur before we set these variables with defaults.
 	if [ "${STANDALONE_INSTALL_PREFIX-}" ] || [ "${STANDALONE_BINARY_NAME-}" ]; then
 		METHOD=standalone
 	fi
-
 	METHOD="${METHOD-detect}"
 	if [ "$METHOD" != detect ] && [ "$METHOD" != standalone ]; then
 		echoerr "Unknown install method \"$METHOD\""
 		echoerr "Run with --help to see usage."
 		exit 1
 	fi
-
-	# We can't reasonably support installing specific versions of Coder through
-	# Homebrew, so if we're on macOS and the `--version` flag or the `--stable`
-	# flag (our tap follows mainline) was set, we should "detect" standalone to
-	# be the appropriate installation method. This check needs to occur before we
-	# set `VERSION` to a default of the latest release.
-	if [ "$OS" = "darwin" ] && { [ "${VERSION-}" ] || [ "${STABLE}" = 1 ]; }; then
-		METHOD=standalone
-	fi
-
 	# These are used by the various install_* functions that make use of GitHub
 	# releases in order to download and unpack the right release.
 	CACHE_DIR=$(echo_cache_dir)
@@ -563,38 +538,27 @@ fetch() {
 }
 
 with_terraform() {
-	# Check if the unzip package is installed. If not error peacefully.
 	if ! (command_exists unzip); then
 		echoh
 		echoerr "This script needs the unzip package to run."
 		echoerr "Please install unzip to use this function"
 		exit 1
 	fi
-	echoh "Installing Terraform version $TERRAFORM_VERSION $TERRAFORM_ARCH from the HashiCorp release repository."
+	echoh "Installing Terraform version $TERRAFORM_VERSION $ARCH from the HashiCorp release repository."
 	echoh
-
-	# Download from official source and save it to cache
-	fetch "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${OS}_${TERRAFORM_ARCH}.zip" \
-		"$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${TERRAFORM_ARCH}.zip"
-
+	fetch "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${OS}_${ARCH}.zip" \
+		"$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${ARCH}.zip"
 	sh_c mkdir -p "$TERRAFORM_INSTALL_PREFIX" 2>/dev/null || true
-
 	sh_c="sh_c"
 	if [ ! -w "$TERRAFORM_INSTALL_PREFIX" ]; then
 		sh_c="sudo_sh_c"
 	fi
-	# Prepare /usr/local/bin/ and the binary for copying
 	"$sh_c" mkdir -p "$TERRAFORM_INSTALL_PREFIX/bin"
-	"$sh_c" unzip -d "$CACHE_DIR" -o "$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${TERRAFORM_ARCH}.zip"
+	"$sh_c" unzip -d "$CACHE_DIR" -o "$CACHE_DIR/terraform_${TERRAFORM_VERSION}_${OS}_${ARCH}.zip"
 	COPY_LOCATION="$TERRAFORM_INSTALL_PREFIX/bin/terraform"
-
-	# Remove the file if it already exists to
-	# avoid https://github.com/coder/coder/issues/2086
 	if [ -f "$COPY_LOCATION" ]; then
 		"$sh_c" rm "$COPY_LOCATION"
 	fi
-
-	# Copy the binary to the correct location.
 	"$sh_c" cp "$CACHE_DIR/terraform" "$COPY_LOCATION"
 }
 
@@ -657,7 +621,6 @@ install_standalone() {
 	darwin) STANDALONE_ARCHIVE_FORMAT=zip ;;
 	*) STANDALONE_ARCHIVE_FORMAT=tar.gz ;;
 	esac
-
 	fetch "https://github.com/coder/coder/releases/download/v$VERSION/coder_${VERSION}_${OS}_${ARCH}.$STANDALONE_ARCHIVE_FORMAT" \
 		"$CACHE_DIR/coder_${VERSION}_${OS}_${ARCH}.$STANDALONE_ARCHIVE_FORMAT"
 
