From bc15f3d99ed68f4c5ecfe3da1752a1de8aada4fa Mon Sep 17 00:00:00 2001 From: tearmoon Date: Thu, 1 Feb 2024 16:52:50 +0700 Subject: [PATCH] Simplified script directory determination. --- box/scripts/box.inotify | 4 +--- box/scripts/box.iptables | 3 +-- box/scripts/box.service | 3 +-- box/scripts/box.tool | 3 +-- box/scripts/start.sh | 10 ++++++---- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/box/scripts/box.inotify b/box/scripts/box.inotify index 62b7444..c6eed5e 100755 --- a/box/scripts/box.inotify +++ b/box/scripts/box.inotify @@ -1,8 +1,6 @@ #!/system/bin/sh -scripts=$(realpath "$0") -scripts_dir=$(dirname "${scripts}") - +scripts_dir="${0%/*}" service_path="${scripts_dir}/box.service" iptables_path="${scripts_dir}/box.iptables" data_box="/data/adb/box" diff --git a/box/scripts/box.iptables b/box/scripts/box.iptables index 8e50d96..bf96837 100755 --- a/box/scripts/box.iptables +++ b/box/scripts/box.iptables @@ -1,7 +1,6 @@ #!/system/bin/sh -scripts=$(realpath "$0") -scripts_dir=$(dirname "${scripts}") +scripts_dir="${0%/*}" source /data/adb/box/settings.ini # Variabel yang digunakan diff --git a/box/scripts/box.service b/box/scripts/box.service index 5b0397b..c29a0f7 100755 --- a/box/scripts/box.service +++ b/box/scripts/box.service @@ -1,7 +1,6 @@ #!/system/bin/sh -scripts=$(realpath "$0") -scripts_dir=$(dirname "${scripts}") +scripts_dir="${0%/*}" source /data/adb/box/settings.ini PROPFILE="/data/adb/modules/box_for_root/module.prop" diff --git a/box/scripts/box.tool b/box/scripts/box.tool index 557491b..3e641c0 100755 --- a/box/scripts/box.tool +++ b/box/scripts/box.tool @@ -1,7 +1,6 @@ #!/system/bin/sh -scripts=$(realpath "$0") -scripts_dir=$(dirname "${scripts}") +scripts_dir="${0%/*}" source /data/adb/box/settings.ini # user agent diff --git a/box/scripts/start.sh b/box/scripts/start.sh index 176ffd4..fe5289d 100755 --- a/box/scripts/start.sh +++ b/box/scripts/start.sh @@ -1,17 +1,19 @@ #!/system/bin/sh -scripts_dir="/data/adb/box/scripts" +scripts_dir="${0%/*}" file_settings="/data/adb/box/settings.ini" moddir="/data/adb/modules/box_for_root" -[ -n "$(magisk -v | grep lite)" ] && moddir="/data/adb/lite_modules/box_for_root" - +moddir="/data/adb/modules/box_for_root" +if [ -n "$(magisk -v | grep lite &> /dev/null )" ]; then + moddir="/data/adb/lite_modules/box_for_root" +fi if [ -f "/data/adb/ksu/bin/busybox" ]; then # busybox KSU busybox="/data/adb/ksu/bin/busybox" elif [ -f "/data/adb/ap/bin/busybox" ]; then - # busybox Apatch + # busybox APatch busybox="/data/adb/ap/bin/busybox" else # busybox Magisk