Skip to content

Commit 23de1d1

Browse files
authored
Update customize.sh
1 parent 0ce8754 commit 23de1d1

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

revanced-magisk/customize.sh

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,21 @@ install() {
8989
VERIF2=$(settings get global package_verifier_enable)
9090
settings put global verifier_verify_adb_installs 0
9191
settings put global package_verifier_enable 0
92+
SZ=$(stat -c "%s" "$MODPATH/$PKG_NAME.apk")
9293
for IT in 1 2; do
94+
if ! SES=$(pmex install-create --user 0 -i com.android.vending -r -d -S "$SZ"); then
95+
ui_print "ERROR: install-create failed"
96+
install_err="$SES"
97+
break
98+
fi
99+
SES=${SES#*[} SES=${SES%]*}
93100
set_perm "$MODPATH/$PKG_NAME.apk" 1000 1000 644 u:object_r:apk_data_file:s0
94-
if ! op=$(pmex install --user 0 -i com.android.vending -r -d "$MODPATH/$PKG_NAME.apk"); then
101+
if ! op=$(pmex install-write -S "$SZ" "$SES" "$PKG_NAME.apk" "$MODPATH/$PKG_NAME.apk"); then
102+
ui_print "ERROR: install-write failed"
103+
install_err="$op"
104+
break
105+
fi
106+
if ! op=$(pmex install-commit "$SES"); then
95107
if echo "$op" | grep -q -e INSTALL_FAILED_VERSION_DOWNGRADE -e INSTALL_FAILED_UPDATE_INCOMPATIBLE; then
96108
ui_print "* Handling install error"
97109
if [ "$IS_SYS" = true ]; then
@@ -122,7 +134,7 @@ install() {
122134
continue
123135
fi
124136
fi
125-
ui_print "ERROR: install failed"
137+
ui_print "ERROR: install-commit failed"
126138
install_err="$op"
127139
break
128140
fi
@@ -167,20 +179,19 @@ ui_print "* Optimizing $PKG_NAME"
167179
nohup cmd package compile --reset "$PKG_NAME" >/dev/null 2>&1 &
168180

169181
if [ "$KSU" ]; then
170-
DSYS=$(dumpsys package "$PKG_NAME")
171-
UID=$(echo "$DSYS" | grep -m1 uid)
182+
UID=$(dumpsys package "$PKG_NAME" | grep -m1 uid)
172183
UID=${UID#*=} UID=${UID%% *}
173184
if [ -z "$UID" ]; then
174-
UID=$(echo "$DSYS" | grep -m1 userId)
185+
UID=$(dumpsys package "$PKG_NAME" | grep -m1 userId)
175186
UID=${UID#*=} UID=${UID%% *}
176187
fi
177188
if [ "$UID" ]; then
178189
if ! OP=$("${MODPATH:?}/bin/$ARCH/ksu_profile" "$UID" "$PKG_NAME" 2>&1); then
179-
echo >&2 "ERROR ksu_profile: $OP"
190+
ui_print "ERROR ksu_profile: $OP"
180191
fi
181192
else
182193
ui_print "no UID"
183-
echo >&2 "$DSYS"
194+
dumpsys package "$PKG_NAME" >&2
184195
fi
185196
fi
186197

0 commit comments

Comments
 (0)