From b1c3e37b9ce3529abae26918039c6921744cd0cb Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Mon, 14 Nov 2022 13:51:24 -0800
Subject: [PATCH] ci/sub: Update for $DEBUG support

---
 ci/release/_install.sh | 4 ----
 ci/release/build.sh    | 4 ++--
 ci/sub                 | 2 +-
 install.sh             | 8 ++++----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ci/release/_install.sh b/ci/release/_install.sh
index 3db966133..29ca02d2b 100755
--- a/ci/release/_install.sh
+++ b/ci/release/_install.sh
@@ -85,10 +85,6 @@ EOF
 }
 
 main() {
-  if [ -n "${DEBUG-}" ]; then
-    set -x
-  fi
-
   METHOD=standalone
   while :; do
     flag_parse "$@"
diff --git a/ci/release/build.sh b/ci/release/build.sh
index 1657c364b..311ec3dec 100755
--- a/ci/release/build.sh
+++ b/ci/release/build.sh
@@ -172,7 +172,7 @@ ARCHIVE=$ARCHIVE \
 TERM=$TERM \
 PATH=\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin\${PATH+:\$PATH}\" \
 ./src/d2/ci/release/_build.sh"
-  sh_c mkdir -p $HW_BUILD_DIR
+  sh_c mkdir -p "$HW_BUILD_DIR"
   sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE"
 }
 
@@ -187,7 +187,7 @@ ARCH=$ARCH \
 ARCHIVE=$ARCHIVE \
 TERM=$TERM \
 ./src/d2/ci/release/build_docker.sh"
-  sh_c mkdir -p $HW_BUILD_DIR
+  sh_c mkdir -p "$HW_BUILD_DIR"
   sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE"
 }
 
diff --git a/ci/sub b/ci/sub
index 7bc83403e..a2da81bcb 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 7bc83403e3fd470a7cba1187e7588ea2c389f41d
+Subproject commit a2da81bcbc12c9ce4f53d8e74385d0d93184484d
diff --git a/install.sh b/install.sh
index 4c45780da..70fc2a2b4 100755
--- a/install.sh
+++ b/install.sh
@@ -49,6 +49,10 @@ if [ "${LIB_LOG-}" ]; then
 fi
 LIB_LOG=1
 
+if [ -n "${DEBUG-}" ]; then
+  set -x
+fi
+
 tput() {
   if [ -n "$TERM" ]; then
     command tput "$@"
@@ -515,10 +519,6 @@ EOF
 }
 
 main() {
-  if [ -n "${DEBUG-}" ]; then
-    set -x
-  fi
-
   METHOD=standalone
   while :; do
     flag_parse "$@"