diff --git a/.github/workflows/publish-update-json.yaml b/.github/workflows/publish-update-json.yaml index 22e1385..ca56430 100644 --- a/.github/workflows/publish-update-json.yaml +++ b/.github/workflows/publish-update-json.yaml @@ -53,6 +53,7 @@ jobs: versionCode="$(grep_prop versionCode "$extract_root/module.prop")" zipUrl="$url" changelog="${{ github.event.release.html_url }}" + jsonFileName="$(echo -n "$id" | sed "s/_/-/g")" echo "-------- Module properties --------" echo "id = $id" @@ -60,13 +61,14 @@ jobs: echo "versionCode = $versionCode" echo "zipUrl = $zipUrl" echo "changelog = $changelog" + echo "jsonFileName = $jsonFileName" if [[ -z "$id" || -z "$version" || -z "$versionCode" || -z "$zipUrl" || -z "$changelog" ]]; then echo "Invalid module.prop" exit 255 fi - printf '{"version":"%s","versionCode":%d,"zipUrl":"%s","changelog":"%s"}' "$version" "$versionCode" "$zipUrl" "$changelog" > "$publish_root/$id.json" + printf '{"version":"%s","versionCode":%d,"zipUrl":"%s","changelog":"%s"}' "$version" "$versionCode" "$zipUrl" "$changelog" > "$publish_root/$jsonFileName.json" (( count++ )) || true done diff --git a/module/build.gradle.kts b/module/build.gradle.kts index e4a05f6..981ef63 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -18,22 +18,22 @@ zygote { riru { id = "riru_$moduleId" - name = "Riru - $moduleName" + name = "$moduleName (Riru)" author = moduleAuthor description = moduleDescription entrypoint = moduleEntrypoint - archiveName = "riru-${moduleId.replace('_', '-')}-${android.defaultConfig.versionName}" - updateJson = "https://github.com/Kr328/Riru-ClipboardWhitelist/releases/latest/download/$id.json" + archiveName = "${id.replace('_', '-')}-${android.defaultConfig.versionName}" + updateJson = "https://github.com/Kr328/Riru-ClipboardWhitelist/releases/latest/download/${id.replace('_', '-')}.json" } zygisk { id = "zygisk_$moduleId" - name = "Zygisk - $moduleName" + name = "$moduleName (Zygisk)" author = moduleAuthor description = moduleDescription entrypoint = moduleEntrypoint - archiveName = "zygisk-${moduleId.replace('_', '-')}-${android.defaultConfig.versionName}" - updateJson = "https://github.com/Kr328/Riru-ClipboardWhitelist/releases/latest/download/$id.json" + archiveName = "${id.replace('_', '-')}-${android.defaultConfig.versionName}" + updateJson = "https://github.com/Kr328/Riru-ClipboardWhitelist/releases/latest/download/${id.replace('_', '-')}.json" } }