mirror of
https://github.com/j-hc/revanced-magisk-module.git
synced 2025-04-29 14:14:38 +02:00
module: update
This commit is contained in:
parent
6f491ad481
commit
4d6ca4bbfc
@ -37,9 +37,16 @@ pmex() {
|
||||
return $RET
|
||||
}
|
||||
|
||||
if ! pmex path "$PKG_NAME" >/dev/null; then
|
||||
if pmex install-existing "$PKG_NAME" >/dev/null; then
|
||||
ui_print "* Installed existing $PKG_NAME"
|
||||
if ! pmex path "$PKG_NAME" >&2; then
|
||||
if pmex install-existing "$PKG_NAME" >&2; then
|
||||
BASEPATH=$(pmex path "$PKG_NAME") || abort "ERROR: pm path failed $BASEPATH"
|
||||
echo >&2 "'$BASEPATH'"
|
||||
BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
|
||||
if [ "${BASEPATH:1:4}" = data ]; then
|
||||
if pmex uninstall -k --user 0 "$PKG_NAME" >&2; then
|
||||
ui_print "* Cleared existing $PKG_NAME package"
|
||||
else abort "ERROR: pm uninstall failed"; fi
|
||||
else ui_print "* Installed stock $PKG_NAME package"; fi
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -48,7 +55,7 @@ INS=true
|
||||
if BASEPATH=$(pmex path "$PKG_NAME"); then
|
||||
echo >&2 "'$BASEPATH'"
|
||||
BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
|
||||
if echo "$BASEPATH" | grep -qF -e '/system/' -e '/product/'; then
|
||||
if [ "${BASEPATH:1:4}" != data ]; then
|
||||
ui_print "* $PKG_NAME is a system app."
|
||||
IS_SYS=true
|
||||
elif [ ! -f "$MODPATH/$PKG_NAME.apk" ]; then
|
||||
@ -77,7 +84,7 @@ install() {
|
||||
VERIF_ADB=$(settings get global verifier_verify_adb_installs)
|
||||
settings put global verifier_verify_adb_installs 0
|
||||
SZ=$(stat -c "%s" "$MODPATH/$PKG_NAME.apk")
|
||||
for _ in 1 2; do
|
||||
for IT in 1 2; do
|
||||
if ! SES=$(pmex install-create --user 0 -i com.android.vending -r -d -S "$SZ"); then
|
||||
ui_print "ERROR: install-create failed"
|
||||
settings put global verifier_verify_adb_installs "$VERIF_ADB"
|
||||
@ -106,6 +113,7 @@ install() {
|
||||
ui_print "* Uninstalling..."
|
||||
if ! op=$(pmex uninstall -k --user 0 "$PKG_NAME"); then
|
||||
ui_print "$op"
|
||||
if [ $IT = 2 ]; then abort "ERROR: pm uninstall failed."; fi
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
|
@ -3,42 +3,47 @@ MODDIR=${0%/*}
|
||||
RVPATH=/data/adb/rvhc/${MODDIR##*/}.apk
|
||||
. "$MODDIR/config"
|
||||
|
||||
until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done
|
||||
until [ -d "/sdcard/Android" ]; do sleep 1; done
|
||||
while
|
||||
BASEPATH=$(pm path "$PKG_NAME" 2>&1 </dev/null)
|
||||
svcl=$?
|
||||
[ $svcl = 20 ]
|
||||
do sleep 2; done
|
||||
sleep 5
|
||||
if [ $svcl != 0 ]; then
|
||||
err "app not installed"
|
||||
exit
|
||||
fi
|
||||
BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
|
||||
|
||||
err() {
|
||||
[ ! -f "$MODDIR/err" ] && cp "$MODDIR/module.prop" "$MODDIR/err"
|
||||
sed -i "s/^des.*/description=⚠️ Needs reflash: '${1}'/g" "$MODDIR/module.prop"
|
||||
}
|
||||
|
||||
if [ ! -d "$BASEPATH/lib" ]; then
|
||||
ls -Zla "$BASEPATH" >"$MODDIR/log.txt"
|
||||
ls -Zla "$BASEPATH/lib" >>"$MODDIR/log.txt"
|
||||
else rm "$MODDIR/log.txt"; fi
|
||||
VERSION=$(dumpsys package "$PKG_NAME" | grep -m1 versionName) VERSION="${VERSION#*=}"
|
||||
if [ "$VERSION" != "$PKG_VER" ] && [ "$VERSION" ]; then
|
||||
err "version mismatch (installed:${VERSION}, module:$PKG_VER)"
|
||||
exit
|
||||
fi
|
||||
grep "$PKG_NAME" /proc/mounts | while read -r line; do
|
||||
mp=${line#* } mp=${mp%% *}
|
||||
umount -l "${mp%%\\*}"
|
||||
done
|
||||
if ! chcon u:object_r:apk_data_file:s0 "$RVPATH"; then
|
||||
err "apk not found"
|
||||
exit
|
||||
fi
|
||||
mount -o bind "$RVPATH" "$BASEPATH/base.apk"
|
||||
am force-stop "$PKG_NAME"
|
||||
[ -f "$MODDIR/err" ] && mv -f "$MODDIR/err" "$MODDIR/module.prop"
|
||||
until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done
|
||||
until [ -d "/sdcard/Android" ]; do sleep 1; done
|
||||
while
|
||||
BASEPATH=$(pm path "$PKG_NAME" 2>&1 </dev/null)
|
||||
SVCL=$?
|
||||
[ $SVCL = 20 ]
|
||||
do sleep 2; done
|
||||
|
||||
run() {
|
||||
if [ $SVCL != 0 ]; then
|
||||
err "app not installed"
|
||||
return
|
||||
fi
|
||||
sleep 4
|
||||
|
||||
BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
|
||||
if [ ! -d "$BASEPATH/lib" ]; then # TODO: is this ok? idk
|
||||
ls -Zla "$BASEPATH" >"$MODDIR/log.txt"
|
||||
ls -Zla "$BASEPATH/lib" >>"$MODDIR/log.txt"
|
||||
else rm "$MODDIR/log.txt" >/dev/null 2>&1; fi
|
||||
VERSION=$(dumpsys package "$PKG_NAME" | grep -m1 versionName) VERSION="${VERSION#*=}"
|
||||
if [ "$VERSION" != "$PKG_VER" ] && [ "$VERSION" ]; then
|
||||
err "version mismatch (installed:${VERSION}, module:$PKG_VER)"
|
||||
return
|
||||
fi
|
||||
grep "$PKG_NAME" /proc/mounts | while read -r line; do
|
||||
mp=${line#* } mp=${mp%% *}
|
||||
umount -l "${mp%%\\*}"
|
||||
done
|
||||
if ! chcon u:object_r:apk_data_file:s0 "$RVPATH"; then
|
||||
err "apk not found"
|
||||
return
|
||||
fi
|
||||
mount -o bind "$RVPATH" "$BASEPATH/base.apk"
|
||||
am force-stop "$PKG_NAME"
|
||||
[ -f "$MODDIR/err" ] && mv -f "$MODDIR/err" "$MODDIR/module.prop"
|
||||
}
|
||||
|
||||
run
|
||||
|
Loading…
x
Reference in New Issue
Block a user