Nuke BB & simplify things

feravolt · Aug 24, 2021 · 358545e · 358545e
1 parent 1b2284b
commit 358545e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/magisk/bin/busybox/busybox b/magisk/bin/busybox/busybox
diff --git a/magisk/flags/fdeai b/magisk/flags/fdeai
@@ -0,0 +1 @@
+12
diff --git a/magisk/initsvc_uperf.sh b/magisk/initsvc_uperf.sh
@@ -11,18 +11,20 @@ wait_until_login()
 {
     # in case of /data encryption is disabled
     while [ "$(getprop sys.boot_completed)" != "1" ]; do
-        sleep 1
+        sleep 2
     done
 
     # we doesn't have the permission to rw "/sdcard" before the user unlocks the screen
     local test_file="/sdcard/Android/.PERMISSION_TEST"
     true > "$test_file"
     while [ ! -f "$test_file" ]; do
         true > "$test_file"
-        sleep 1
+        sleep 2
     done
     rm "$test_file"
 }
 
 wait_until_login
-sh "$BASEDIR"/run_uperf.sh
+sh "$BASEDIR"/script/prepare.sh
+sh "$BASEDIR"/script/powercfg_once.sh
+sh "$BASEDIR"/script/start_injector.sh
diff --git a/magisk/run_uperf.sh b/magisk/run_uperf.sh
diff --git a/magisk/script/pathinfo.sh b/magisk/script/pathinfo.sh
@@ -11,7 +11,4 @@ LOG_FILE="$USER_PATH/log_uperf_initsvc.log"
 FLAGS="$MODULE_PATH/flags"
 SCRIPT_DIR="$MODULE_PATH/script"
 BIN_DIR="$MODULE_PATH/bin"
-
-# use private busybox
 PATH="/sbin:/system/sbin:/system/xbin:/system/bin:/vendor/xbin:/vendor/bin"
-PATH="$BIN_DIR/busybox:$PATH"