From 625ea6bd04b46b64219ee29399f3392c64946ba1 Mon Sep 17 00:00:00 2001
From: Joseph Werle <joseph.werle@gmail.com>
Date: Sun, 12 Mar 2023 14:06:22 -0400
Subject: [PATCH] chore(): clean up lint

---
 lib/package/package.sh |  4 ++--
 setup.sh               | 45 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/lib/package/package.sh b/lib/package/package.sh
index c63677f..fbcbc74 100755
--- a/lib/package/package.sh
+++ b/lib/package/package.sh
@@ -155,9 +155,9 @@ bpkg_package () {
                 awk '{ $1=""; print $0 }' | ## print value
                 sed 's/^\s*//g'           | ## remove leading whitespace
                 sed 's/\s*$//g'           | ## remove trailing whitespace
-                sed 's/^"//g'             | ## remove leading quote from JSON value
+                sed 's/^ *//;s/ *$//'     | ## clean up extra whitespace
                 sed 's/"$//g'             | ## remove trailing quote from JSON value
-                sed 's/^ *//;s/ *$//'
+                sed 's/^"//g'               ## remove leading quote from JSON value
             } || return $?
           else
             echo -e "${results[@]}"
diff --git a/setup.sh b/setup.sh
index 2d24051..e13d526 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2317
 #
 # #             #
 # #mmm   mmmm   #   m   mmmm
@@ -47,20 +48,20 @@ setup () {
   {
     echo
     echo "  info: Creating temporary files..."
-    cd "$TMPDIR" || exit
+    cd "$TMPDIR" || return $?
     test -d "$DEST" && { echo "  warn: Already exists: '$DEST'"; }
-    rm -rf "$DEST"
+    rm -rf "$DEST" || return $?
 
     echo "  info: Fetching 'bpkg@$BRANCH'..."
-    git clone --depth=1 --branch "$BRANCH" "$REMOTE" "$DEST" > /dev/null 2>&1
-    cd "$DEST" || exit
+    git clone --depth=1 --branch "$BRANCH" "$REMOTE" "$DEST" > /dev/null 2>&1 || return $?
+    cd "$DEST" || reutnr $?
 
     echo "  info: Installing..."
     echo
-    make_install
+    make_install || return $?
     echo "  info: Done!"
   } >&2
-  return $?
+  return 0
 }
 
 ## make targets
@@ -91,6 +92,19 @@ CMDS+=("update")
 CMDS+=("utils")
 CMDS+=("realpath")
 
+make_uninstall () {
+  echo "  info: Uninstalling $PREFIX/bin/$BIN*"
+  echo "    rm: $PREFIX/bin/$BIN'"
+  rm -f "$PREFIX/bin/$BIN"
+  for cmd in "${CMDS[@]}"; do
+    if test -f "$PREFIX/bin/$BIN-$cmd"; then
+      echo "    rm: $PREFIX/bin/$BIN-$cmd'"
+      rm -f "$PREFIX/bin/$BIN-$cmd"
+    fi
+  done
+  return $?
+}
+
 make_install () {
   local source
 
@@ -122,28 +136,15 @@ make_install () {
   return $?
 }
 
-make_uninstall () {
-  echo "  info: Uninstalling $PREFIX/bin/$BIN*"
-  echo "    rm: $PREFIX/bin/$BIN'"
-  rm -f "$PREFIX/bin/$BIN"
-  for cmd in "${CMDS[@]}"; do
-    if test -f "$PREFIX/bin/$BIN-$cmd"; then
-      echo "    rm: $PREFIX/bin/$BIN-$cmd'"
-      rm -f "$PREFIX/bin/$BIN-$cmd"
-    fi
-  done
-  return $?
-}
-
 make_link () {
-  make_uninstall
+  make_uninstall || return $?
   echo "  info: Linking $PREFIX/bin/$BIN*"
   echo "  link: '$PWD/$BIN' -> '$PREFIX/bin/$BIN'"
-  ln -s "$PWD/$BIN" "$PREFIX/bin/$BIN"
+  ln -s "$PWD/$BIN" "$PREFIX/bin/$BIN" || return $?
   for cmd in "${CMDS[@]}"; do
     if test -f "$PWD/$BIN-$cmd"; then
       echo "  link: '$PWD/$BIN-$cmd' -> '$PREFIX/bin/$BIN-$cmd'"
-      ln -s "$PWD/$BIN-$cmd" "$PREFIX/bin/$BIN-$cmd"
+      ln -s "$PWD/$BIN-$cmd" "$PREFIX/bin/$BIN-$cmd" || return $?
     fi
   done
   return $?