Chore: rename module name & json name

Kr328 · Feb 1, 2022 · 86d7435 · 86d7435
1 parent 0a275ef
commit 86d7435
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/publish-update-json.yaml b/.github/workflows/publish-update-json.yaml
@@ -53,20 +53,22 @@ 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"
               echo "version = $version"
               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
@@ -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"
     }
 }