module: update

This commit is contained in:
j-hc 2024-10-22 12:56:34 +03:00
parent 6f491ad481
commit 4d6ca4bbfc
No known key found for this signature in database
GPG Key ID: CDF97F1DBFE904CD
2 changed files with 52 additions and 39 deletions

View File

@ -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

View File

@ -3,33 +3,35 @@ 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
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"; fi
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)"
exit
return
fi
grep "$PKG_NAME" /proc/mounts | while read -r line; do
mp=${line#* } mp=${mp%% *}
@ -37,8 +39,11 @@ grep "$PKG_NAME" /proc/mounts | while read -r line; do
done
if ! chcon u:object_r:apk_data_file:s0 "$RVPATH"; then
err "apk not found"
exit
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