rename _resetprop to resetprop

kasi-x · May 27, 2023 · 6c6e651 · 6c6e651
1 parent 4fce5db
commit 6c6e651
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/bin/arm64-v8a/_resetprop → bin/arm64-v8a/resetprop b/bin/arm64-v8a/_resetprop → bin/arm64-v8a/resetprop
diff --git a/bin/armeabi-v7a/_resetprop → bin/armeabi-v7a/resetprop b/bin/armeabi-v7a/_resetprop → bin/armeabi-v7a/resetprop
diff --git a/bin/x86/_resetprop → bin/x86/resetprop b/bin/x86/_resetprop → bin/x86/resetprop
diff --git a/bin/x86_64/_resetprop → bin/x86_64/resetprop b/bin/x86_64/_resetprop → bin/x86_64/resetprop
diff --git 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)):