#44: fixed bug preventing unrecognized option message from showing co…

…rrectly
lando · May 15, 2024 · 671789a · 671789a
1 parent cea4cbc
commit 671789a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,6 +31,8 @@ jobs:
         run: npm clean-install
       - name: Lint
         run: npm run lint
+      - name: Export formatted release date
+        run: echo "RELEASE_DATE=$(date -d "${{ github.event.release.published_at }}" "+%B %e, %Y" | tr -s ' ')" >> $GITHUB_ENV
       - name: Prepare release
         uses: lando/prepare-release-action@v3
         env:
@@ -41,3 +43,10 @@ jobs:
           sync-token: ${{ secrets.RTFM47_COAXIUM_INJECTOR }}
           sync-email: [email protected]
           sync-username: rtfm-47
+          update-files: CHANGELOG.md
+          update-files-header: |
+            ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
+          update-files-meta: |
+            UNRELEASED_DATE=${{ env.RELEASE_DATE }}
+            UNRELEASED_LINK=${{ github.event.release.html_url }}
+            UNRELEASED_VERSION=${{ github.event.release.tag_name }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+{{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
+
+* Fixed bug preventing `Unrecognized option` message from showing correctly [#44](https://github.com/lando/setup-lando/issues/44)
+
 ## v3.2.0 - [May 3, 2024](https://github.com/lando/setup-lando/releases/tag/v3.2.0)
 
 * Improved `$TMPDIR` handling for non standard `/tmp` usage [#41](https://github.com/lando/setup-lando/issues/41)

diff --git a/setup-lando.sh b/setup-lando.sh
@@ -192,7 +192,9 @@ ${tty_green}Environment Variables:${tty_reset}
   CI               installs in CI mode (e.g. does not prompt for user input)
 
 EOS
-  exit "${1:-0}"
+  if [[ "${1:-0}" != "noexit" ]]; then
+    exit "${1:-0}"
+  fi
 }
 
 while [[ $# -gt 0 ]]; do
@@ -249,8 +251,8 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     *)
-      warn "Unrecognized option: '$1'"
-      usage 1
+      usage "noexit"
+      abort "${tty_red}Unrecognized option${tty_reset} ${tty_bold}$1${tty_reset}! See available options in usage above."
       ;;
   esac
 done