From 6c6e651d79e9b323e7b4e8855e9cd41adeef5e2d Mon Sep 17 00:00:00 2001
From: Rikka <ayasa0520@gmail.com>
Date: Mon, 1 May 2023 17:19:53 +0800
Subject: [PATCH] rename _resetprop to resetprop

---
 bin/arm64-v8a/{_resetprop => resetprop}   | Bin
 bin/armeabi-v7a/{_resetprop => resetprop} | Bin
 bin/x86/{_resetprop => resetprop}         | Bin
 bin/x86_64/{_resetprop => resetprop}      | Bin
 stuffs/general.py                         |  12 +++++-------
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename bin/arm64-v8a/{_resetprop => resetprop} (100%)
 rename bin/armeabi-v7a/{_resetprop => resetprop} (100%)
 rename bin/x86/{_resetprop => resetprop} (100%)
 rename bin/x86_64/{_resetprop => resetprop} (100%)

diff --git a/bin/arm64-v8a/_resetprop b/bin/arm64-v8a/resetprop
similarity index 100%
rename from bin/arm64-v8a/_resetprop
rename to bin/arm64-v8a/resetprop
diff --git a/bin/armeabi-v7a/_resetprop b/bin/armeabi-v7a/resetprop
similarity index 100%
rename from bin/armeabi-v7a/_resetprop
rename to bin/armeabi-v7a/resetprop
diff --git a/bin/x86/_resetprop b/bin/x86/resetprop
similarity index 100%
rename from bin/x86/_resetprop
rename to bin/x86/resetprop
diff --git a/bin/x86_64/_resetprop b/bin/x86_64/resetprop
similarity index 100%
rename from bin/x86_64/_resetprop
rename to bin/x86_64/resetprop
diff --git a/stuffs/general.py b/stuffs/general.py
index 73a41da..f377e0b 100644
--- a/stuffs/general.py
+++ b/stuffs/general.py
@@ -67,22 +67,20 @@ def extract(self):
             z.extractall(self.extract_to)
 
     def add_props(self):
-        bin_dir = os.path.join(self.copy_dir, "system", "bin")
+        bin_dir = os.path.join(self.copy_dir, "system", "etc")
         resetprop_rc = os.path.join(
             self.copy_dir, "system/etc/init/resetprop.rc")
-        if not os.path.isfile(os.path.join(bin_dir, "_resetprop")):
+        if not os.path.isfile(os.path.join(bin_dir, "resetprop")):
             if not os.path.exists(bin_dir):
                 os.makedirs(bin_dir)
             shutil.copy(os.path.join(
-                "./bin", self.arch[0], "_resetprop"), bin_dir)
-            os.chmod(os.path.join(bin_dir, "_resetprop"), 0o755)
+                "./bin", self.arch[0], "resetprop"), bin_dir)
+            os.chmod(os.path.join(bin_dir, "resetprop"), 0o755)
         if not os.path.isfile(os.path.join(bin_dir, "resetprop.sh")):
             with open(os.path.join(bin_dir, "resetprop.sh"), "w") as f:
                 f.write("#!/system/bin/sh\n")
                 f.write(
-                    "temp_dir=$(mktemp -d);ln -s /system/bin/_resetprop \"${temp_dir}/resetprop\"\n")
-                f.write(
-                    "while read line; do \"${temp_dir}/resetprop\" ${line%=*} ${line#*=}; done < /vendor/waydroid.prop\n")
+                    "while read line; do /system/etc/resetprop ${line%=*} ${line#*=}; done < /vendor/waydroid.prop\n")
             os.chmod(os.path.join(bin_dir, "resetprop.sh"), 0o755)
         if not os.path.isfile(resetprop_rc):
             if not os.path.exists(os.path.dirname(resetprop_rc)):