From 70587d58322bbd848e293f7362791b1d0a572d4c Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Tue, 6 Dec 2022 04:18:40 -0800
Subject: [PATCH] install.sh: Add -x, --trace flags

---
 ci/release/_install.sh             | 10 +++++++++-
 ci/release/template/scripts/lib.sh |  2 +-
 ci/sub                             |  2 +-
 install.sh                         | 12 ++++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 0e991c7fe..25e0aa2a5 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -15,7 +15,7 @@ help() {
 
   cat <<EOF
 usage: $arg0 [-d|--dry-run] [--version vX.X.X] [--edge] [--method detect] [--prefix path]
-  [--tala latest] [--force] [--uninstall]
+  [--tala latest] [--force] [--uninstall] [-x|--trace]
 
 install.sh automates the installation of D2 onto your system. It currently only supports
 the installation of standalone releases from GitHub and via Homebrew on macOS. See the
@@ -93,6 +93,9 @@ Flags:
   package manager to uninstall instead.
   note: tala will also be uninstalled if installed.
 
+-x, --trace:
+  Run script with set -x.
+
 All downloaded archives are cached into ~/.cache/d2/release. use \$XDG_CACHE_HOME to change
 path of the cached assets. Release archives are unarchived into \$PREFIX/lib/d2/d2-<VERSION>
 
@@ -147,6 +150,11 @@ main() {
         flag_noarg && shift "$FLAGSHIFT"
         UNINSTALL=1
         ;;
+      x|trace)
+        flag_noarg && shift "$FLAGSHIFT"
+        set -x
+        export TRACE=1
+        ;;
       *)
         flag_errusage "unrecognized flag $FLAGRAW"
         ;;
diff --git a/ci/release/template/scripts/lib.sh b/ci/release/template/scripts/lib.sh
index ff78d5171..3209b4862 100644
--- a/ci/release/template/scripts/lib.sh
+++ b/ci/release/template/scripts/lib.sh
@@ -84,7 +84,7 @@ if [ "${LIB_LOG-}" ]; then
 fi
 LIB_LOG=1
 
-if [ -n "${DEBUG-}" ]; then
+if [ -n "${TRACE-}" ]; then
   set -x
 fi
 
diff --git a/ci/sub b/ci/sub
index 4beb5c09e..4c26167ba 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 4beb5c09e5e3380641ee7e3b0c1d4f6358cca544
+Subproject commit 4c26167bafbb6b4d038004c7e7666b2533a882d3
diff --git a/install.sh b/install.sh
index b7402592b..0a25923a1 100755
--- a/install.sh
+++ b/install.sh
@@ -89,7 +89,7 @@ if [ "${LIB_LOG-}" ]; then
 fi
 LIB_LOG=1
 
-if [ -n "${DEBUG-}" ]; then
+if [ -n "${TRACE-}" ]; then
   set -x
 fi
 
@@ -597,7 +597,7 @@ help() {
 
   cat <<EOF
 usage: $arg0 [-d|--dry-run] [--version vX.X.X] [--edge] [--method detect] [--prefix path]
-  [--tala latest] [--force] [--uninstall]
+  [--tala latest] [--force] [--uninstall] [-x|--trace]
 
 install.sh automates the installation of D2 onto your system. It currently only supports
 the installation of standalone releases from GitHub and via Homebrew on macOS. See the
@@ -675,6 +675,9 @@ Flags:
   package manager to uninstall instead.
   note: tala will also be uninstalled if installed.
 
+-x, --trace:
+  Run script with set -x.
+
 All downloaded archives are cached into ~/.cache/d2/release. use \$XDG_CACHE_HOME to change
 path of the cached assets. Release archives are unarchived into \$PREFIX/lib/d2/d2-<VERSION>
 
@@ -729,6 +732,11 @@ main() {
         flag_noarg && shift "$FLAGSHIFT"
         UNINSTALL=1
         ;;
+      x|trace)
+        flag_noarg && shift "$FLAGSHIFT"
+        set -x
+        export TRACE=1
+        ;;
       *)
         flag_errusage "unrecognized flag $FLAGRAW"
         ;;