Update ACC

CrazyBoyFeng · Jun 7, 2022 · e1123f3 · e1123f3
1 parent 38d765c
commit e1123f3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/app/src/main/assets/acc_v2022.2.22.1_202202221.tgz b/app/src/main/assets/acc_v2022.2.22.1_202202221.tgz
diff --git a/app/src/main/assets/acc_v2022.6.4_202206040.tgz b/app/src/main/assets/acc_v2022.6.4_202206040.tgz
diff --git a/app/src/main/assets/install-tarball.sh b/app/src/main/assets/install-tarball.sh
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 # ${1:-$id} Tarball Installer
-# Copyright 2019-2021, VR25
+# Copyright 2019-2022, VR25
 # License: GPLv3+
 #
 # this file must be in the same directory as the tarball
@@ -20,31 +20,35 @@ set -x
 
 # set up busybox
 #BB#
-[ -x /dev/.vr25/busybox/ls ] || {
-  mkdir -p /dev/.vr25/busybox
-  chmod 0700 /dev/.vr25/busybox
-  if [ -f /data/adb/vr25/bin/busybox ]; then
-    [ -x /data/adb/vr25/bin/busybox ] || chmod -R 0700 /data/adb/vr25/bin
-    /data/adb/vr25/bin/busybox --install -s /dev/.vr25/busybox
-  elif [ -f /data/adb/magisk/busybox ]; then
-    [ -x /data/adb/magisk/busybox ] || chmod 0700 /data/adb/magisk/busybox
-    /data/adb/magisk/busybox --install -s /dev/.vr25/busybox
-  elif which busybox > /dev/null; then
-    eval "$(which busybox) --install -s /dev/.vr25/busybox"
-  else
-    echo "(!) Install busybox or simply place it in /data/adb/vr25/bin/"
+bin_dir=/data/adb/vr25/bin
+busybox_dir=/dev/.vr25/busybox
+magisk_busybox=/data/adb/magisk/busybox
+[ -x $busybox_dir/ls ] || {
+  mkdir -p $busybox_dir
+  chmod 0700 $busybox_dir
+  for f in $bin_dir/busybox $magisk_busybox /system/*bin/busybox*; do
+    [ -f $f ] && {
+      [ -x $f ] || chmod 0755 $f 2>/dev/null
+      $f --install -s $busybox_dir/
+      break
+    }
+  done
+  [ -x $busybox_dir/ls ] || {
+    echo "Install busybox or simply place it in $bin_dir/"
+    echo
     exit 3
-  fi
+  }
 }
 case $PATH in
-  /data/adb/vr25/bin:*) :;;
-  *) export PATH=/data/adb/vr25/bin:/dev/.vr25/busybox:$PATH;;
+  $bin_dir:*) ;;
+  *) export PATH="$bin_dir:$busybox_dir:$PATH";;
 esac
+unset f bin_dir busybox_dir magisk_busybox
 #/BB#
 
 # root check
 [ $(id -u) -ne 0 ] && {
-  echo "(!) $0 must run as root (su)"
+  echo "$0 must run as root (su)"
   exit 4
 }
 

diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources translatable="false">
-    <integer name="acc_version_code">202202221</integer>
-    <string name="acc_version_name">2022.2.22.1</string>
+    <integer name="acc_version_code">202206040</integer>
+    <string name="acc_version_name">2022.6.4</string>
     <string name="acc_daemon">acc_daemon</string>
     <!--battery info-->
     <string name="info_status">STATUS</string>