From bdb2e36a645d7a48fabe6385367e209115a6952a Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 17 Nov 2022 11:30:42 -0800
Subject: [PATCH 1/4] 2022-11-17 11:30:42AM

---
 ci/release/_install.sh | 11 ++++++++++-
 install.sh             | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 7406eca3f..4ac7fbbc6 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -181,8 +181,14 @@ install() {
   if [ -n "${TALA-}" ]; then
     log "tala-$TALA_VERSION-$OS-$ARCH has been successfully installed into $PREFIX"
   fi
+  log "Rerun this install script with --uninstall to uninstall"
   if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then
     logcat >&2 <<EOF
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+NEXT STEPS
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
 Extend your \$PATH to use d2:
   export PATH=$PREFIX/bin:\$PATH
 Then run:
@@ -207,8 +213,11 @@ EOF
       log "  Run man d2plugin-tala for detailed docs."
     fi
   fi
+  logcat >&2 <<EOF
 
-  log "Rerun the install script with --uninstall to uninstall"
+Something not working? Please let us know:
+https://github.com/terrastruct/d2/issues/new
+EOF
 }
 
 install_d2() {
diff --git a/install.sh b/install.sh
index 9c005b998..440d9a5f2 100755
--- a/install.sh
+++ b/install.sh
@@ -186,7 +186,7 @@ This script needs to run the following command as root:
   $*
 Please install doas, sudo, or su.
 EOF
-    exit 1
+    return 1
   fi
 }
 
@@ -214,7 +214,7 @@ hide() {
     return
   fi
   cat "$out" >&2
-  exit "$code"
+  return "$code"
 }
 
 echo_dur() {
@@ -615,8 +615,14 @@ install() {
   if [ -n "${TALA-}" ]; then
     log "tala-$TALA_VERSION-$OS-$ARCH has been successfully installed into $PREFIX"
   fi
+  log "Rerun this install script with --uninstall to uninstall"
   if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then
     logcat >&2 <<EOF
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+NEXT STEPS
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
 Extend your \$PATH to use d2:
   export PATH=$PREFIX/bin:\$PATH
 Then run:
@@ -641,8 +647,11 @@ EOF
       log "  Run man d2plugin-tala for detailed docs."
     fi
   fi
+  logcat >&2 <<EOF
 
-  log "Rerun the install script with --uninstall to uninstall"
+Something not working? Please let us know:
+https://github.com/terrastruct/d2/issues/new
+EOF
 }
 
 install_d2() {

From 8ac1135e76ac9c96efbd8f43e7316ddc305d84aa Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 17 Nov 2022 11:37:06 -0800
Subject: [PATCH 2/4] fix typo

---
 ci/release/_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 4ac7fbbc6..2dda110a2 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -318,7 +318,7 @@ uninstall_standalone_d2() {
 
   if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION"
-    warn "d2 have been installed via some other installation method."
+    warn "d2 has been installed via some other installation method."
     return 1
   fi
 
@@ -341,7 +341,7 @@ uninstall_standalone_tala() {
 
   if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION"
-    warn "tala have been installed via some other installation method."
+    warn "tala has been installed via some other installation method."
     return 1
   fi
 

From 52e12a8169a90413c6d8c10e827a24870e3e4818 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 17 Nov 2022 11:37:14 -0800
Subject: [PATCH 3/4] ge

---
 install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 440d9a5f2..864a128f5 100755
--- a/install.sh
+++ b/install.sh
@@ -752,7 +752,7 @@ uninstall_standalone_d2() {
 
   if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION"
-    warn "d2 have been installed via some other installation method."
+    warn "d2 has been installed via some other installation method."
     return 1
   fi
 
@@ -775,7 +775,7 @@ uninstall_standalone_tala() {
 
   if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION"
-    warn "tala have been installed via some other installation method."
+    warn "tala has been installed via some other installation method."
     return 1
   fi
 

From 5a1f976df877a063734c38dce971a7ebf59a5c2a Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 17 Nov 2022 11:38:21 -0800
Subject: [PATCH 4/4] must have

---
 ci/release/_install.sh | 4 ++--
 install.sh             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 2dda110a2..2917323ad 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -318,7 +318,7 @@ uninstall_standalone_d2() {
 
   if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION"
-    warn "d2 has been installed via some other installation method."
+    warn "d2 must have been installed via some other installation method."
     return 1
   fi
 
@@ -341,7 +341,7 @@ uninstall_standalone_tala() {
 
   if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION"
-    warn "tala has been installed via some other installation method."
+    warn "tala must have been installed via some other installation method."
     return 1
   fi
 
diff --git a/install.sh b/install.sh
index 864a128f5..5cc51950f 100755
--- a/install.sh
+++ b/install.sh
@@ -752,7 +752,7 @@ uninstall_standalone_d2() {
 
   if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION"
-    warn "d2 has been installed via some other installation method."
+    warn "d2 must have been installed via some other installation method."
     return 1
   fi
 
@@ -775,7 +775,7 @@ uninstall_standalone_tala() {
 
   if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then
     warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION"
-    warn "tala has been installed via some other installation method."
+    warn "tala must have been installed via some other installation method."
     return 1
   fi