cuynu/mbbpatch_oldest_may
Watch
1
Fork
You've already forked mbbpatch_oldest_may
 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: mbcpapp.sh: use return instead of exit when applicable

Browse source 
avoid exiting the entire script when one func fails

Signed-off-by: fukiame <fukiame@proton.me>
This commit is contained in:
Hikarie Fukirei 2025-07-28 23:44:01 +07:00
commit 3eba2a7e0d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MBCPApp/mbcpapp.sh
View file

@ -72,14 +72,14 @@ copy_assets() {
is_unpacked() { [ -d ~/mbbpatch/MBCPApp/mbapk/mbapk_unpacked ] ; }
is_unpacked_lib() {
[ -d ~/mbbpatch/MBCPApp/mbapk/mbapk_unpacked/lib ] || {
echo "ERROR : [mbapk_unpacked/lib] folder not found ! Please unpack APK first !" ; exit 127
echo "ERROR : [mbapk_unpacked/lib] folder not found ! Please unpack APK first !" ; return 127
}
}
apktool_exist() {
[ -f ~/mbbpatch/MBCPApp/tools/apktool.jar ] || { echo "ERROR : apktool not found" ; exit 127 ; }
[ -f ~/mbbpatch/MBCPApp/tools/apktool.jar ] || { echo "ERROR : apktool not found" ; return 127 ; }
}
apkeditor_exist() {
[ -f ~/mbbpatch/MBCPApp/tools/apkeditor.jar ] || { echo "ERROR : apkeditor not found" ; exit 127 ; }
[ -f ~/mbbpatch/MBCPApp/tools/apkeditor.jar ] || { echo "ERROR : apkeditor not found" ; return 127 ; }
}
mb_apk_exist() {
ls ~/mbbpatch/MBCPApp/mbapk/*.apk >/dev/null 2>&1 || {
@ -92,7 +92,7 @@ unpack_mbcp() {
local - ; set -e
apktool_exist && mb_apk_exist
is_unpacked && rm -rf 'mbapk/mbapk_unpacked' || :
java -jar tools/apktool.jar d mbapk/*.apk -o mbapk/mbapk_unpacked -j$(nproc) || { echo "ERROR : Unpacking failed !" ; exit 1 ; }
java -jar tools/apktool.jar d mbapk/*.apk -o mbapk/mbapk_unpacked -j$(nproc) || { echo "ERROR : Unpacking failed !" ; return 1 ; }
echo "Cleaning useless files..."
rm -rf 'mbapk/mbapk_unpacked/assets/_4A9w8flncUrhDOG8dyqLi_azBTYT3PlSXz0hiCzRQA_'
rm -rf 'mbapk/mbapk_unpacked/assets/0QDl12M5S2hKxoKF4cNI4kEX1qDQRMiOd34TXjSjy4M_'
@ -127,7 +127,7 @@ unpack_mbcp() {
repack_mbcp() {
apktool_exist
is_unpacked || { echo "ERROR : [mbapk_unpacked] folder not found ! Please unpack APK first !" ; exit 127 ; }
is_unpacked || { echo "ERROR : [mbapk_unpacked] folder not found ! Please unpack APK first !" ; return 127 ; }
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'
(