diff --git a/README.md b/README.md index dd87818..7c439d1 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,6 @@ Zygisk loader for KernelSU, which allows Zygisk modules to run without Magisk en It is possible to run Zygisksu on Magisk with a few steps: -1. `mkdir /data/adb/ksu` -2. `ln -s /data/adb/modules /data/adb/ksu/modules` -3. `cp $(which resetprop) /data/adb/ksu/resetprop` +1. `mkdir -p /data/adb/ksu/bin` +2. `ln -s /data/adb/modules /data/adb/ksu/` +3. `cp $(which resetprop) /data/adb/ksu/bin/resetprop` diff --git a/loader/src/include/deny.hpp b/loader/src/injector/deny.hpp similarity index 100% rename from loader/src/include/deny.hpp rename to loader/src/injector/deny.hpp diff --git a/loader/src/include/jni_hooks.hpp b/loader/src/injector/jni_hooks.hpp similarity index 100% rename from loader/src/include/jni_hooks.hpp rename to loader/src/injector/jni_hooks.hpp diff --git a/loader/src/include/memory.hpp b/loader/src/injector/memory.hpp similarity index 98% rename from loader/src/include/memory.hpp rename to loader/src/injector/memory.hpp index a09654e..cc619e9 100644 --- a/loader/src/include/memory.hpp +++ b/loader/src/injector/memory.hpp @@ -1,14 +1,14 @@ #pragma once #include +#include #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-builtins" #include #pragma clang diagnostic pop -#include -#include +#include "misc.hpp" namespace jni_hook { diff --git a/loader/src/include/misc.hpp b/loader/src/injector/misc.hpp similarity index 100% rename from loader/src/include/misc.hpp rename to loader/src/injector/misc.hpp diff --git a/module/src/daemon.sh b/module/src/daemon.sh index 99dbbca..6d1c094 100644 --- a/module/src/daemon.sh +++ b/module/src/daemon.sh @@ -8,5 +8,5 @@ export NATIVE_BRIDGE=$(getprop ro.dalvik.vm.native.bridge) [ "$DEBUG" = true ] && export RUST_BACKTRACE=1 log -p i -t "zygisksu" "Start watchdog" -/data/adb/ksu/resetprop ro.dalvik.vm.native.bridge libzygiskloader.so +/data/adb/ksu/bin/resetprop ro.dalvik.vm.native.bridge libzygiskloader.so exec "$MODDIR/bin/zygiskwd" >/dev/null 2>&1 diff --git a/zygiskd/src/utils.rs b/zygiskd/src/utils.rs index 61fe2d5..43ac3d4 100644 --- a/zygiskd/src/utils.rs +++ b/zygiskd/src/utils.rs @@ -28,7 +28,7 @@ pub fn get_native_bridge() -> String { } pub fn restore_native_bridge() -> Result<()> { - Command::new("/data/adb/ksu/resetprop") + Command::new("/data/adb/ksu/bin/resetprop") .arg(constants::PROP_NATIVE_BRIDGE) .arg(get_native_bridge()) .spawn()?.wait()?;