From 22edc08a5ca3ddaea2c0e7c1b7baa1ad809113f9 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sun, 11 Mar 2018 16:19:18 +0100 Subject: [PATCH] nanodroid-overlay script does not (no longer) require Bash --- ChangeLog.md | 2 ++ Full/nanodroid-functions | 10 ++-------- Full/system/xbin/nanodroid-overlay | 2 +- Full/system/xbin/novl | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 0bc2728..e3b3f21 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -8,6 +8,8 @@ * switch from stable to beta build for QKSMS * Patcher, Uninstaller * initial A/B parition scheme support +* NanoDroid-Overlay Script + * does not (more precisly: no longer) require Bash, default Shell is enough * Updates (automatic) * AnySoftKeyboard (1.9.1117) * Déjà Vu nlpBackend (1.1.3) diff --git a/Full/nanodroid-functions b/Full/nanodroid-functions index b91a1cf..c65ada2 100644 --- a/Full/nanodroid-functions +++ b/Full/nanodroid-functions @@ -217,9 +217,7 @@ backup_nlpconflicts () { ui_print " ++ it conflicts with microG location backends" ui_print " " - ${MODPATH}/system/xbin/bash \ - ${MODPATH}/system/xbin/nanodroid-overlay \ - --add ${app} + ${MODPATH}/system/xbin/nanodroid-overlay --add ${app} fi ;; esac @@ -437,8 +435,7 @@ magisk_install_postinst () { if [ "${nanodroid_overlay}" -eq 1 ]; then ui_print " << with /system applications override" - ${MODPATH}/system/xbin/bash.bin -e \ - ${MODPATH}/system/xbin/nanodroid-overlay --create + ${MODPATH}/system/xbin/nanodroid-overlay --create else ui_print " << without /system applications override" fi @@ -652,11 +649,8 @@ install_novl () { ui_print " << NanoDroid-Overlay Script" nanodroid_install_file xbin/nanodroid-overlay bin - nanodroid_substitute xbin/nanodroid-overlay nanodroid_install_file xbin/novl bin - nanodroid_substitute xbin/novl - nanodroid_install_file xbin/column.${BIN_ARCH} bin nanodroid_install_file xbin/aapt.${BIN_ARCH} bin } diff --git a/Full/system/xbin/nanodroid-overlay b/Full/system/xbin/nanodroid-overlay index b2f2975..c2e6357 100755 --- a/Full/system/xbin/nanodroid-overlay +++ b/Full/system/xbin/nanodroid-overlay @@ -1,4 +1,4 @@ -#!@MODPATH@/system/xbin/bash +#!/system/bin/sh export NO_MAGISK=0 export NO_CONFIG=0 diff --git a/Full/system/xbin/novl b/Full/system/xbin/novl index f393432..4ee4bf3 100755 --- a/Full/system/xbin/novl +++ b/Full/system/xbin/novl @@ -1,4 +1,4 @@ -#!@MODPATH@/system/xbin/bash +#!/system/bin/sh # just call nanodroid-overlay nanodroid-overlay "${@}"