diff --git a/.github/workflows/build-on-schedule.yml b/.github/workflows/build-on-schedule.yml index 37733ca..6e5a2ea 100644 --- a/.github/workflows/build-on-schedule.yml +++ b/.github/workflows/build-on-schedule.yml @@ -66,10 +66,10 @@ jobs: - name: Check if module build ID already exists id: check_build_id run: | - BASENAME=${{ steps.extract_and_build.outputs.module_base_name }} + BASENAME="${{ steps.extract_and_build.outputs.module_base_name }}" BUILD_ID=${{ steps.extract_and_build.outputs.device_build_id }} EXISTING_RELEASE_NOTES=$(curl --silent "https://api.github.com/repos/$GITHUB_REPOSITORY/releases" | jq '.[].body') - if echo "$EXISTING_RELEASE_NOTES" | grep -q "$BASENAME\..*\($BUILD_ID\)"; then + if echo "$EXISTING_RELEASE_NOTES" | grep -q "${BASENAME}_${BUILD_ID}"; then echo "BUILD_EXISTS=true" >> $GITHUB_OUTPUT else echo "BUILD_EXISTS=false" >> $GITHUB_OUTPUT diff --git a/build_magisk_module.sh b/build_magisk_module.sh index 1a72190..9893594 100644 --- a/build_magisk_module.sh +++ b/build_magisk_module.sh @@ -29,7 +29,7 @@ device_build_security_patch=$(grep_prop "ro.vendor.build.security_patch" "$syste device_codename=${device_codename^} # Construct the base name -base_name="$device_codename.A$device_build_android_version.$(date -d "$device_build_security_patch" '+%y%m%d').($device_build_id)" +base_name="${device_codename}_$device_build_id" # Prepare the result directory mkdir -p "result/$result_base_name"