Merge pull request #1131 from jdaugherty/7.0.x

verification fixes

Author: jdaugherty

etc/bin/extract-build-artifact.sh

@@ -40,7 +40,7 @@ if [ -z "${EXTRACT_LOCATION}/second/${ARTIFACT_NAME}" ]; then
     echo "❌ Second Artifact Not found: ${ARTIFACT_NAME} could not be found under ${EXTRACT_LOCATION}/second/${ARTIFACT_NAME}"
     exit 1;
 else
-  echo "     ✅ Second Artifact Found @ ${EXTRACT_LOCATION}/first/${ARTIFACT_NAME}"
+  echo "     ✅ Second Artifact Found @ ${EXTRACT_LOCATION}/second/${ARTIFACT_NAME}"
 fi
 
 rm -rf "${EXTRACT_LOCATION}/firstArtifact" || true

etc/bin/verify.sh

@@ -21,7 +21,7 @@ set -euo pipefail
 
 PROJECT_NAME='grails-spring-security'
 RELEASE_TAG=$1
-DOWNLOAD_LOCATION="${2:-downloads}"
+DOWNLOAD_LOCATION="${2:-.}"
 DOWNLOAD_LOCATION=$(realpath "${DOWNLOAD_LOCATION}")
 
 if [ -z "${RELEASE_TAG}" ]; then
@@ -61,7 +61,16 @@ java -version
 
 echo "Bootstrap Gradle ..."
 cd "${DOWNLOAD_LOCATION}/${PROJECT_NAME}/gradle-bootstrap"
-gradlew
+
+if GRADLE_CMD="$(command -v gradlew 2>/dev/null)"; then
+    :   # found the wrapper on PATH
+elif GRADLE_CMD="$(command -v gradle 2>/dev/null)"; then
+    :   # fall back to system-wide Gradle
+else
+    echo "ERROR: Neither gradlew nor gradle found on \$PATH." >&2
+    exit 1
+fi
+${GRADLE_CMD}
 echo "✅ Gradle Bootstrapped"
 
 echo "Applying License Audit ..."