From 2cb9719e605f9196d31cabc72e1cbff457139685 Mon Sep 17 00:00:00 2001
From: Admire <admire1971@outlook.com>
Date: Mon, 20 May 2024 19:23:41 +0800
Subject: [PATCH] move moduleId

---
 build.gradle.kts               | 2 +-
 loader/src/ptracer/monitor.cpp | 2 +-
 module/src/webroot/index.html  | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7b7d0ce..89a276a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ fun String.execute(currentWorkingDir: File = file("./")): String {
 val gitCommitCount = "git rev-list HEAD --count".execute().toInt()
 val gitCommitHash = "git rev-parse --verify --short HEAD".execute()
 
-val moduleId by extra("zygisksu")
+val moduleId by extra("admirepowered")
 val moduleName by extra("Zygisk_mod")
 val verName by extra("v4-0.9.3")
 val verCode by extra(gitCommitCount)
diff --git a/loader/src/ptracer/monitor.cpp b/loader/src/ptracer/monitor.cpp
index c7c7b13..458662b 100644
--- a/loader/src/ptracer/monitor.cpp
+++ b/loader/src/ptracer/monitor.cpp
@@ -558,7 +558,7 @@ static void updateStatus() {
 
 static bool prepare_environment() {
     prop_path = zygiskd::GetTmpPath() + "/module.prop";
-    info_path = "/data/adb/modules/zygisksu/info.json";
+    info_path = "/data/adb/modules/info.json";
     close(open(prop_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0644));
     auto orig_prop = xopen_file("./module.prop", "r");
     if (orig_prop == nullptr) {
diff --git a/module/src/webroot/index.html b/module/src/webroot/index.html
index 1f8e7c9..986c9c2 100644
--- a/module/src/webroot/index.html
+++ b/module/src/webroot/index.html
@@ -88,10 +88,10 @@
 			//alert('Art')
 			console.log(witch.checked)
 			if (witch.checked){
-				info = ksu.exec('touch /data/adb/modules/zygisksu/noable');//关闭按钮
+				info = ksu.exec('touch /sdcard/noable');//关闭按钮
 				//alert(info);
 			}{
-				info = ksu.exec('rm /data/adb/modules/zygisksu/noable');//开启按钮
+				info = ksu.exec('rm /sdcard/noable');//开启按钮
 				//alert(info);
 			}
 	  });
@@ -117,15 +117,14 @@
 			html[0].setAttribute("class","mdui-theme-auto")
 	  });
 
-	  //item[1].textContent='1.0-RC2(245)';
 	  try	{
 		info = ksu.exec('/data/adb/modules/zygisksu/bin/zygiskd64 version');
 		item[1].textContent=info;
-		info = ksu.exec('if [ -e /data/adb/modules/zygisksu/noable ]; then echo 1; fi');
+		info = ksu.exec('if [ -e /sdcard/noable ]; then echo 1; fi');
 		if (info!=""){
 			witch.checked=false;
 		}
-		info = ksu.exec('cat /data/adb/modules/zygisksu/info.json');
+		info = ksu.exec('cat /data/adb/modules/info.json');
 		//alert(info)
 		//var info = '{"a":0,"b":0,"p32":0,"p64":0}'
 		list = JSON.parse(info)