insert NVBASE to scripts during flash

This commit is contained in:
j-hc 2023-02-09 00:43:18 +03:00
parent 1786a6193c
commit 0a14a51031
3 changed files with 12 additions and 5 deletions

View File

@ -66,15 +66,22 @@ RVPATH=$NVBASE/rvhc/__PKGNAME_rv.apk
mv -f $MODPATH/base.apk $RVPATH
if ! op=$(su -Mc mount -o bind $RVPATH $BASEPATH 2>&1); then
ui_print "ERROR: Mount failed!"
ui_print "$op"
abort "Flash the module in official Magisk Manager app"
ui_print "WARNING: Mount failed! Trying in non-global mountspace mode"
if ! op=$(mount -o bind $RVPATH $BASEPATH 2>&1); then
ui_print "ERROR: $op"
abort "Try flasing the module in official Magisk Manager app"
fi
fi
am force-stop __PKGNAME
ui_print "* Optimizing __PKGNAME"
cmd package compile --reset __PKGNAME &
ui_print "* Cleanup"
rm -rf $MODPATH/bin $MODPATH/__PKGNAME.apk $NVBASE/__PKGNAME_rv.apk
for s in "uninstall.sh" "service.sh"; do
sed -i "2 i\NVBASE=${NVBASE}" $MODPATH/$s
done
ui_print "* Done"
ui_print " by j-hc (github.com/j-hc)"

View File

@ -1,7 +1,7 @@
#!/system/bin/sh
# shellcheck disable=SC2086
MODDIR=${0%/*}
RVPATH=/data/adb/rvhc/__PKGNAME_rv.apk
RVPATH=${NVBASE}/rvhc/__PKGNAME_rv.apk
until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done
until [ "$(getprop init.svc.bootanim)" = stopped ]; do sleep 1; done
sleep 3

View File

@ -1,7 +1,7 @@
#!/system/bin/sh
{
rm /data/adb/rvhc/__PKGNAME_rv.apk
rmdir /data/adb/rvhc
rm ${NVBASE}/rvhc/__PKGNAME_rv.apk
rmdir ${NVBASE}/rvhc
if __ISBNDL :; then
until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done
until [ "$(getprop init.svc.bootanim)" = stopped ]; do sleep 1; done