ci: add guards to bash script

Author: ledif

.github/workflows/package-release.yml

@@ -38,26 +38,32 @@ jobs:
       - name: Create package
         id: create_package
         run: |
-          # Capture output in a variable
-          RESULT=$(.github/workflows/scripts/create-package.sh "${{ steps.version.outputs.version }}" "${{ steps.current_time.outputs.timestamp }}")
-          # Check if script succeeded
-          if [ $? -ne 0 ]; then
-            echo "Error creating package"
+          # Create the package and capture only the filename
+          FILENAME=$(.github/workflows/scripts/create-package.sh "${{ steps.version.outputs.version }}" "${{ steps.current_time.outputs.timestamp }}")
+          
+          # Debug output
+          echo "Package script returned: '$FILENAME'"
+          
+          # Validate that the file exists
+          if [ -f "$FILENAME" ]; then
+            echo "Found package file: $FILENAME"
+            echo "package_path=$FILENAME" >> $GITHUB_OUTPUT
+          else
+            echo "ERROR: Package file not found: $FILENAME"
             exit 1
           fi
-          # Check if file exists
-          if [ ! -f "$RESULT" ]; then
-            echo "Package file not found: $RESULT"
-            exit 1
-          fi
-          # Set outputs
-          echo "PACKAGE_PATH=$RESULT" >> $GITHUB_ENV
-          echo "package_path=$RESULT" >> $GITHUB_OUTPUT
+
+      - name: Debug outputs
+        run: |
+          echo "Version: ${{ steps.version.outputs.version }}"
+          echo "Package path: ${{ steps.create_package.outputs.package_path }}"
+          ls -la
 
       - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
+        # Run this step in all cases where we have a package
+        if: steps.create_package.outputs.package_path != ''
         with:
           files: ${{ steps.create_package.outputs.package_path }}
           name: Rider-Waite-Smith Tarot Deck v${{ steps.version.outputs.version }}

.github/workflows/scripts/create-package.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 # Get the version from the first parameter
 VERSION=$1
@@ -14,6 +15,8 @@ fi
 PACKAGE_NAME="rider-waite-smith-${VERSION}"
 ZIP_FILE="${PACKAGE_NAME}.zip"
 
+echo "Creating package: ${ZIP_FILE}..."
+
 # Create a temporary directory for packaging
 TEMP_DIR=$(mktemp -d)
 DECK_DIR="${TEMP_DIR}/${PACKAGE_NAME}"
@@ -33,22 +36,14 @@ Repository: ${GITHUB_REPOSITORY:-"arcanaland/specifications"}
 This package follows the Tarot Deck Specification v1.0.
 EOL
 
-# Create the zip file and suppress the output
-(cd "${TEMP_DIR}" && zip -r "${ZIP_FILE}" "${PACKAGE_NAME}" >/dev/null)
-
-# Check if zip command was successful
-if [ $? -ne 0 ]; then
-  echo "ERROR: Failed to create zip file" >&2
-  rm -rf "${TEMP_DIR}"
-  exit 1
-fi
+# Create the zip file and redirect output to stderr so it doesn't affect the function output
+(cd "${TEMP_DIR}" && zip -r "${ZIP_FILE}" "${PACKAGE_NAME}" 1>&2)
 
 # Move the zip file to the current directory
 mv "${TEMP_DIR}/${ZIP_FILE}" .
 
 # Clean up the temporary directory
 rm -rf "${TEMP_DIR}"
 
-# Output just the filename, no other text
-echo "${ZIP_FILE}"
-
+echo "Package created: ${ZIP_FILE}" >&2
+printf "%s" "${ZIP_FILE}" # Print the filename without newline