Fix release script consistency issues

- Quote date command substitution for defensive programming
- Apply shfmt formatting

Author: oschwald

dev-bin/release.sh

@@ -6,28 +6,28 @@ set -eu -o pipefail
 # before making any changes to the repository
 
 check_command() {
-    if ! command -v "$1" &> /dev/null; then
-        echo "Error: $1 is not installed or not in PATH"
-        exit 1
-    fi
+	if ! command -v "$1" &>/dev/null; then
+		echo "Error: $1 is not installed or not in PATH"
+		exit 1
+	fi
 }
 
 # Verify gh CLI is authenticated
-if ! gh auth status &> /dev/null; then
-    echo "Error: gh CLI is not authenticated. Run 'gh auth login' first."
-    exit 1
+if ! gh auth status &>/dev/null; then
+	echo "Error: gh CLI is not authenticated. Run 'gh auth login' first."
+	exit 1
 fi
 
 # Verify we can access this repository via gh
-if ! gh repo view --json name &> /dev/null; then
-    echo "Error: Cannot access repository via gh. Check your authentication and repository access."
-    exit 1
+if ! gh repo view --json name &>/dev/null; then
+	echo "Error: Cannot access repository via gh. Check your authentication and repository access."
+	exit 1
 fi
 
 # Verify git can connect to the remote (catches SSH key issues, etc.)
-if ! git ls-remote origin &> /dev/null; then
-    echo "Error: Cannot connect to git remote. Check your git credentials/SSH keys."
-    exit 1
+if ! git ls-remote origin &>/dev/null; then
+	echo "Error: Cannot connect to git remote. Check your git credentials/SSH keys."
+	exit 1
 fi
 
 check_command perl
@@ -36,19 +36,19 @@ check_command mvn
 # Check that we're not on the main branch
 current_branch=$(git branch --show-current)
 if [ "$current_branch" = "main" ]; then
-    echo "Error: Releases should not be done directly on the main branch."
-    echo "Please create a release branch and run this script from there."
-    exit 1
+	echo "Error: Releases should not be done directly on the main branch."
+	echo "Please create a release branch and run this script from there."
+	exit 1
 fi
 
 # Fetch latest changes and check that we're not behind origin/main
 echo "Fetching from origin..."
 git fetch origin
 
 if ! git merge-base --is-ancestor origin/main HEAD; then
-    echo "Error: Current branch is behind origin/main."
-    echo "Please merge or rebase with origin/main before releasing."
-    exit 1
+	echo "Error: Current branch is behind origin/main."
+	echo "Please merge or rebase with origin/main before releasing."
+	exit 1
 fi
 
 changelog=$(cat CHANGELOG.md)
@@ -62,39 +62,39 @@ regex='
 '
 
 if [[ ! $changelog =~ $regex ]]; then
-      echo "Could not find date line in change log!"
-      exit 1
+	echo "Could not find date line in change log!"
+	exit 1
 fi
 
 version="${BASH_REMATCH[1]}"
 date="${BASH_REMATCH[2]}"
 notes="$(echo "${BASH_REMATCH[3]}" | sed -n -e '/^[0-9]\+\.[0-9]\+\.[0-9]\+/,$!p')"
 
-if [[ "$date" !=  $(date +"%Y-%m-%d") ]]; then
-    echo "$date is not today!"
-    exit 1
+if [[ "$date" != "$(date +"%Y-%m-%d")" ]]; then
+	echo "$date is not today!"
+	exit 1
 fi
 
 tag="v$version"
 
 if [ -n "$(git status --porcelain)" ]; then
-    echo ". is not clean." >&2
-    exit 1
+	echo ". is not clean." >&2
+	exit 1
 fi
 
 if [ ! -d .gh-pages ]; then
-    echo "Checking out gh-pages in .gh-pages"
-    git clone -b gh-pages [email protected]:maxmind/MaxMind-DB-Reader-java.git .gh-pages
-    pushd .gh-pages
+	echo "Checking out gh-pages in .gh-pages"
+	git clone -b gh-pages [email protected]:maxmind/MaxMind-DB-Reader-java.git .gh-pages
+	pushd .gh-pages
 else
-    echo "Updating .gh-pages"
-    pushd .gh-pages
-    git pull
+	echo "Updating .gh-pages"
+	pushd .gh-pages
+	git pull
 fi
 
 if [ -n "$(git status --porcelain)" ]; then
-    echo ".gh-pages is not clean" >&2
-    exit 1
+	echo ".gh-pages is not clean" >&2
+	exit 1
 fi
 
 popd
@@ -105,21 +105,21 @@ mvn versions:display-dependency-updates
 read -r -n 1 -p "Continue given above dependencies? (y/n) " should_continue
 
 if [ "$should_continue" != "y" ]; then
-    echo "Aborting"
-    exit 1
+	echo "Aborting"
+	exit 1
 fi
 
 mvn test
 
 read -r -n 1 -p "Continue given above tests? (y/n) " should_continue
 
 if [ "$should_continue" != "y" ]; then
-    echo "Aborting"
-    exit 1
+	echo "Aborting"
+	exit 1
 fi
 
 page=.gh-pages/index.md
-cat <<EOF > $page
+cat <<EOF >$page
 ---
 layout: default
 title: MaxMind DB Java API
@@ -134,14 +134,14 @@ mvn versions:set -DnewVersion="$version"
 perl -pi -e "s/(?<=<version>)[^<]*/$version/" README.md
 perl -pi -e "s/(?<=com\.maxmind\.db\:maxmind-db\:)\d+\.\d+\.\d+([\w\-]+)?/$version/" README.md
 
-cat README.md >> $page
+cat README.md >>$page
 
 git diff
 
 read -r -n 1 -p "Commit changes? " should_commit
 if [ "$should_commit" != "y" ]; then
-    echo "Aborting"
-    exit 1
+	echo "Aborting"
+	exit 1
 fi
 git add README.md pom.xml
 git commit -m "Preparing for $version"
@@ -166,8 +166,8 @@ $notes
 read -r -n 1 -p "Push to origin? " should_push
 
 if [ "$should_push" != "y" ]; then
-    echo "Aborting"
-    exit 1
+	echo "Aborting"
+	exit 1
 fi
 
 git push