From 7a260db2790f465eee8ee75885c6dc58d8f30417 Mon Sep 17 00:00:00 2001
From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
Date: Fri, 15 Nov 2024 23:11:51 -0500
Subject: [PATCH] Simplify defaults for unsupplied script arguments.

Partial #638

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
---
 script/brew_core_update | 14 +++-----------
 script/brew_tap_update  | 14 +++-----------
 script/uninstall        |  6 +-----
 script/version_bump     |  7 ++-----
 4 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/script/brew_core_update b/script/brew_core_update
index a9a1684..33df90d 100755
--- a/script/brew_core_update
+++ b/script/brew_core_update
@@ -50,21 +50,13 @@ if [[ "${DRY_RUN}" == 'true' ]]; then
 fi
 
 # arg 1 - version tag
-if [[ -n "${1}" ]]; then
-  MAS_VERSION="${1}"
-else
-  MAS_VERSION="v$(script/version)"
-fi
+MAS_VERSION="${1:-"v$(script/version)"}"
 
 echo "MAS_VERSION: ${MAS_VERSION}"
 
 # arg 2 - revision (commit hash)
-if [[ -n "${2}" ]]; then
-  REVISION="${2}"
-else
-  # Derive revision from version. Fails if MAS_VERSION is not a tag.
-  REVISION="$(git rev-parse "${MAS_VERSION}")"
-fi
+# If arg 2 wasn't supplied or is empty, obtain revision from ${MAS_VERSION} version tag
+REVISION="${2:-"$(git rev-parse "${MAS_VERSION}")"}"
 
 echo "REVISION: ${REVISION}"
 
diff --git a/script/brew_tap_update b/script/brew_tap_update
index 98a1559..edfe45a 100755
--- a/script/brew_tap_update
+++ b/script/brew_tap_update
@@ -20,21 +20,13 @@ if [[ "${#}" -gt 2 ]]; then
 fi
 
 # arg 1 - version tag
-if [[ -n "${1}" ]]; then
-  MAS_VERSION="${1}"
-else
-  MAS_VERSION="v$(script/version)"
-fi
+MAS_VERSION="${1:-"v$(script/version)"}"
 
 echo "MAS_VERSION: ${MAS_VERSION}"
 
 # arg 2 - revision (commit hash)
-if [[ -n "${2}" ]]; then
-  REVISION="${2}"
-else
-  # Derive revision from version. Fails if MAS_VERSION is not a tag.
-  REVISION="$(git rev-parse "${MAS_VERSION}")"
-fi
+# If arg 2 wasn't supplied or is empty, obtain revision from ${MAS_VERSION} version tag
+REVISION="${2:-"$(git rev-parse "${MAS_VERSION}")"}"
 
 echo "REVISION: ${REVISION}"
 
diff --git a/script/uninstall b/script/uninstall
index a03566d..12ff608 100755
--- a/script/uninstall
+++ b/script/uninstall
@@ -7,11 +7,7 @@
 #
 
 # Override default prefix path with optional 1st arg
-if test -n "${1}"; then
-  PREFIX="${1}"
-else
-  PREFIX="$(brew --prefix)"
-fi
+PREFIX="${1:-"$(brew --prefix)"}"
 
 echo "==> 🔥 Uninstalling mas from ${PREFIX}"
 
diff --git a/script/version_bump b/script/version_bump
index 4b42292..ee7b016 100755
--- a/script/version_bump
+++ b/script/version_bump
@@ -32,11 +32,8 @@ fi
 MAS_VERSION="${1}"
 
 # arg 2 - revision (commit hash)
-if [[ "${#}" -ge 2 ]]; then
-  REVISION="${2}"
-else
-  REVISION="$(git rev-parse "${MAS_VERSION}")"
-fi
+# If arg 2 wasn't supplied or is empty, obtain revision from ${MAS_VERSION} version tag
+REVISION="${2:-"$(git rev-parse "${MAS_VERSION}")"}"
 
 echo "MAS_VERSION: ${MAS_VERSION}"
 echo "REVISION: ${REVISION}"