use local install.sh in e2e tests

aslilac · aslilac · commit 26fa3c68f069 · 2023-09-07T15:36:40.000Z
diff --git a/install.sh b/install.sh
@@ -100,7 +100,9 @@ echo_standalone_postinstall() {
 
 	cath <<EOF
 
-Standalone release has been installed into $STANDALONE_INSTALL_PREFIX/bin/$STANDALONE_BINARY_NAME
+Coder has been installed to
+
+  $STANDALONE_INSTALL_PREFIX/bin/$STANDALONE_BINARY_NAME
 
 EOF
 
@@ -114,7 +116,7 @@ Extend your path to use Coder:
 
 EOF
 	elif [ "$CODER_COMMAND" != "$STANDALONE_BINARY_LOCATION" ]; then
-		echo_path_conflict "$CODER_COMMAND" "$STANDALONE_INSTALL_PREFIX"
+		echo_path_conflict "$CODER_COMMAND"
 	else
 		cath <<EOF
 To run a Coder server:
@@ -135,16 +137,23 @@ echo_brew_postinstall() {
 		return
 	fi
 
-	CODER_COMMAND="$(command -v "coder")"
 	BREW_PREFIX="$(brew --prefix)"
 
+	cath <<EOF
+
+Coder has been installed to
+
+  $BREW_PREFIX/bin/coder
+
+EOF
+
+	CODER_COMMAND="$(command -v "coder")"
+
 	if [ "$CODER_COMMAND" != "$BREW_PREFIX/bin/coder" ]; then
 		echo_path_conflict "$CODER_COMMAND" "$BREW_PREFIX"
 	fi
 
 	cath <<EOF
-Homebrew formula has been installed.
-
 To run a Coder server:
 
   $ coder server
@@ -199,6 +208,10 @@ There is another binary in your PATH that conflicts with the binary we've instal
 
   $1
 
+The binary that we just installed is located here:
+
+  $2
+
 This is likely because of an existing installation of Coder. See our documentation for suggests on how to resolve this.
 
 	https://coder.com/docs/v2/latest/install/install.sh#path-conflicts
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -263,30 +263,19 @@ export const downloadCoderVersion = async (
     return binaryPath;
   }
 
-  // Runs our public install script using our options to
-  // install the binary!
+  // Run our official install script to install the binary
   await new Promise<void>((resolve, reject) => {
     const cp = spawn(
-      "sh",
+      path.join(__dirname, "../../install.sh"),
       [
-        "-c",
-        [
-          "curl",
-          "-L",
-          "https://coder.com/install.sh",
-          "|",
-          "sh",
-          "-s",
-          "--",
-          "--version",
-          version,
-          "--method",
-          "standalone",
-          "--prefix",
-          tempDir,
-          "--binary-name",
-          binaryName,
-        ].join(" "),
+        "--version",
+        version,
+        "--method",
+        "standalone",
+        "--prefix",
+        tempDir,
+        "--binary-name",
+        binaryName,
       ],
       {
         env: {
