From 51b0753ba2eb1399a5d4f017cc95a14e2d597652 Mon Sep 17 00:00:00 2001 From: fukiame Date: Wed, 30 Jul 2025 10:29:41 +0700 Subject: [PATCH] chore: mbcpapp.sh: commonize is_unpacked usage the only oddball using this was purged out Signed-off-by: fukiame --- MBCPApp/mbcpapp.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MBCPApp/mbcpapp.sh b/MBCPApp/mbcpapp.sh index 44cd6cd..037a641 100755 --- a/MBCPApp/mbcpapp.sh +++ b/MBCPApp/mbcpapp.sh @@ -65,7 +65,11 @@ copy_assets() { adb shell su -c cp -rf "/data/user/0/com.mbmobile/files/$1" /sdcard/assets } -is_unpacked() { [ -d "$DIRPATH"/mbapk/mbapk_unpacked ] ; } +is_unpacked() { + [ -d "$DIRPATH"/mbapk/mbapk_unpacked ] || { + echo "ERROR : [mbapk_unpacked] not found ! Please unpack APK first !" ; return 127 + } +} is_unpacked_lib() { [ -d "$DIRPATH"/mbapk/mbapk_unpacked/lib ] || { echo "ERROR : [mbapk_unpacked/lib] folder not found ! Please unpack APK first !" ; return 127 @@ -122,8 +126,7 @@ unpack_mbcp() { } repack_mbcp() { - apktool_exist - is_unpacked || { echo "ERROR : [mbapk_unpacked] folder not found ! Please unpack APK first !" ; exit 127 ; } + apktool_exist && is_unpacked echo "Repacking APK..." echo "Compiled by MBCPApp Patcher on $(uname -s -r) with commit $COMMIT at $(date). That's all xD" > 'mbapk/mbapk_unpacked/assets/mbcp_info/mbcpinfo.txt' ( @@ -145,10 +148,7 @@ repack_mbcp() { } check_mbshield() { - is_unpacked || { - echo "[mbapk_unpacked] not found ! Please unpack APK first !" - return 1 - } + is_unpacked if [ -f "$DIRPATH"/mbapk/mbapk_unpacked/assets/mbshield.szip ] then echo "$mbshield_found"