Merge branch 'testing'

Signed-off-by: Yash D. Saraf <[email protected]>
yashdsaraf · Sep 6, 2017 · db7d7ed · db7d7ed
2 parents 6eb6b82 + c8c4933
commit db7d7ed
Show file tree

Hide file tree

Showing 8 changed files with 292 additions and 181 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ install: scripts/install-dependencies.sh
 script: scripts/readytorock.sh
 env:
   global:
-    - VER="1.27.1-YDS"
+    - VER="1.27.2-YDS"
     - STATUS="stable"
     - BUILD_TAG="v${VER}-$(TZ=UTC date +'%Y%m%d%H%M')"
     - TEMP_DIR=$(mktemp -d)

diff --git a/bbx/AIO/META-INF/com/google/android/update-binary b/bbx/AIO/META-INF/com/google/android/update-binary
@@ -3,12 +3,12 @@
 #by YashdSaraf@XDA
 
 print_banner() {
-    ui_print_ "================================================"
-    ui_print_ "   BusyBox $VER Universal ($STATUS: $DATE)      "
-    ui_print_ "-- by @YashdSaraf https://xda-developers.com --"
-    ui_print_ "      ----- http://bit.ly/bbxyds -----   "
-    ui_print_ "================================================"
-    ui_print_ "  "
+    ui_print "================================================"
+    ui_print "   BusyBox $VER Universal ($STATUS: $DATE)      "
+    ui_print "-- by @YashdSaraf https://xda-developers.com --"
+    ui_print "      ----- http://bit.ly/bbxyds -----   "
+    ui_print "================================================"
+    ui_print "  "
 }
 
 check_arch() {
@@ -22,9 +22,9 @@ check_arch() {
             if echo $FOUNDARCH | grep -E "${ARCH}(_)?64" >/dev/null 2>&1
                 then
                 BBFILE=busybox64
-                ui_print_ "** $ARCH ** 64 bit architecture detected --"
+                ui_print "** $ARCH ** 64 bit architecture detected --"
             else
-                ui_print_ "** $ARCH ** 32 bit architecture detected --"
+                ui_print "** $ARCH ** 32 bit architecture detected --"
             fi
             break
         fi
@@ -36,6 +36,6 @@ check_arch() {
 }
 
 unzip_files() {
-    unzip -o "$BBZIP" $ARCH/bins.md5 $ARCH/$BBFILE $ARCH/ssl_helper $ARCH/xzdec
+    unzip -o "$BBZIP" $ARCH/bins.md5 $ARCH/$BBFILE $ARCH/ssl_helper $ARCH/xzdec magisk_install.sh
     mv $ARCH/* .
 }
diff --git a/bbx/META-INF/com/google/android/update-binary b/bbx/META-INF/com/google/android/update-binary
@@ -6,31 +6,31 @@ ARCH=
 ARCH64=
 
 print_banner() {
-    ui_print_ "================================================"
-    ui_print_ "   BusyBox $VER $ARCH ($STATUS: $DATE)   "
-    ui_print_ "-- by @YashdSaraf https://xda-developers.com --"
-    ui_print_ "      ----- http://bit.ly/bbxyds -----   "
-    ui_print_ "================================================"
-    ui_print_ "  "
+    ui_print "================================================"
+    ui_print "   BusyBox $VER $ARCH ($STATUS: $DATE)   "
+    ui_print "-- by @YashdSaraf https://xda-developers.com --"
+    ui_print "      ----- http://bit.ly/bbxyds -----   "
+    ui_print "================================================"
+    ui_print "  "
 }
 
 check_arch() {
-    ui_print_ "Looking for => '$ARCH', found => '$FOUNDARCH'"
+    ui_print "Looking for => '$ARCH', found => '$FOUNDARCH'"
 
     if [ "${FOUNDARCH::${#ARCH64}}" == "$ARCH64" ]
         then
         BBFILE=busybox64
-        ui_print_ "64 bit architecture detected --"
+        ui_print "64 bit architecture detected --"
     elif [ "${FOUNDARCH::${#ARCH}}" == "$ARCH" ]
         then
         BBFILE=busybox
-        ui_print_ "32 bit architecture detected --"
+        ui_print "32 bit architecture detected --"
     else
         false
         error "Wrong architecture found"
     fi
 }
 
 unzip_files() {
-    unzip -o "$BBZIP" bins.md5 $BBFILE ssl_helper xzdec
+    unzip -o "$BBZIP" bins.md5 $BBFILE ssl_helper xzdec magisk_install.sh
 }
diff --git a/bbx/cleaner/META-INF/com/google/android/update-binary b/bbx/cleaner/META-INF/com/google/android/update-binary
@@ -110,7 +110,7 @@ exec 2>>$LOGFILE
 ui_print "================================================"
 ui_print "                BusyBox Cleaner         "
 ui_print "-- by @YashdSaraf https://xda-developers.com --"
-ui_print "      ----- http://bit.ly/bbxyds -----   "
+ui_print "       ----- http://bit.ly/bbxyds -----   "
 ui_print "==============================================="
 ui_print "  "
 sleep 1
@@ -152,16 +152,23 @@ SUIMG=$(
 ) 2>/dev/null
 MAGISK=$(ls /data/magisk.img) 2>/dev/null
 
-if ! [ -z "$SUIMG" -a -z "$MAGISK" ]
+if [ ! -z "$SUIMG" ]
     then
+    SULOOPDEV=$(mount_systemless $SUIMG "/su")
     ui_print "Systemless root detected --"
-    [ -z "$SUIMG" ] || SULOOPDEV=$(mount_systemless $SUIMG "/su")
-    [ -z "$MAGISK" ] || MAGISKLOOPDEV=$(mount_systemless $MAGISK "/magisk")
+elif [ -d /data/adb/su/xbin ]
+    then ui_print "Systemless root detected (Running in SBIN mode) --"
 fi
 
-ui_print "Cleaning up busybox --"
+if [ ! -z "$MAGISK" ]
+    then
+    ui_print "Magisk detected --"
+    MAGISKLOOPDEV=$(mount_systemless $MAGISK "/magisk")
+fi
+
+ui_print "Cleaning busybox --"
 TOTALSYMLINKS=0
-POSSIBLE_CLEANDIRS="/system/xbin /system/bin /su/xbin /su/bin /magisk/phh/bin /vendor/bin /system/vendor/bin $INSTALLDIR"
+POSSIBLE_CLEANDIRS="/su/xbin /data/adb/su/xbin /system/xbin /system/vendor/bin /vendor/bin /data/adb/su/bin /system/bin /su/bin /magisk/phh/bin /su/xbin_bind /data/adb/su/xbin_bind $INSTALLDIR"
 for dir in $POSSIBLE_CLEANDIRS
 do
     if [ -e $dir/busybox ]
@@ -208,4 +215,6 @@ if [ ! -z $MAGISKLOOPDEV ]
 fi
 umount /system
 ui_print "All DONE! -- Check $LOGFILE for more info"
-ui_print "**Uninstalling BusyBox might break some mods or apps**"
+ui_print "**************************************************"
+ui_print "Uninstalling BusyBox might break some mods or apps"
+ui_print "**************************************************"