fix bug in install.sh, clean up output a bit more

aslilac · aslilac · commit 8e08d7ae6b18 · 2023-09-07T18:16:27.000Z
diff --git a/install.sh b/install.sh
@@ -100,21 +100,23 @@ 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
 
-	CODER_COMMAND="$(command -v "$STANDALONE_BINARY_NAME")"
+	CODER_COMMAND="$(command -v "$STANDALONE_BINARY_NAME" || true)"
 
-	if [ ! "$CODER_COMMAND" ]; then
+	if [ -z "${CODER_COMMAND}" ]; then
 		cath <<EOF
 Extend your path to use Coder:
 
   $ PATH="$STANDALONE_INSTALL_PREFIX/bin:\$PATH"
 
 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" || true)"
+
 	if [ "$CODER_COMMAND" != "$BREW_PREFIX/bin/coder" ]; then
-		echo_path_conflict "$CODER_COMMAND" "$BREW_PREFIX"
+		echo_path_conflict "$CODER_COMMAND"
 	fi
 
 	cath <<EOF
-Homebrew formula has been installed.
-
 To run a Coder server:
 
   $ coder server
