diff --git a/MBCPApp/common.sh b/MBCPApp/common.sh index d270ea5..402b8a2 100644 --- a/MBCPApp/common.sh +++ b/MBCPApp/common.sh @@ -126,7 +126,7 @@ pblock() { echo "$1" > "$blocker" } -get_mb_ver() { +mb_ver() { [ -z "$1" ] && return 42 a="$(grep -m1 'android:versionName' "$DIRPATH"/mbapk/mbapk_unpacked/AndroidManifest.xml | tr ' ' '\n' | grep -m1 'android:versionName')" a="$(bb_split "$a" '=' '1')" diff --git a/MBCPApp/parse.sh b/MBCPApp/parse.sh index 9a638b1..4878c5f 100644 --- a/MBCPApp/parse.sh +++ b/MBCPApp/parse.sh @@ -87,9 +87,8 @@ for f in patches/*.sh ; do minminor="$(bb_split "$minver" '.' '1')" minpatch="$(bb_split "$minver" '.' '2')" - [ "$(( \ - $(get_mb_ver 0) * 10000 + $(get_mb_ver 1) * 100 + $(get_mb_ver 2) ))" -lt \ - "$(( minmajor * 10000 + minminor * 100 + minpatch ))" \ + [ "$(( $(mb_ver 0) * 10000 + $(mb_ver 1) * 100 + $(mb_ver 2) ))" -lt \ + "$(( minmajor * 10000 + minminor * 100 + minpatch ))" \ ] && { info "[parser] skipping [$pname] as current version is lower than patch version clamp" continue ; } @@ -105,9 +104,8 @@ for f in patches/*.sh ; do maxminor="$(bb_split "$maxver" '.' '1')" maxpatch="$(bb_split "$maxver" '.' '2')" - [ "$(( \ - $(get_mb_ver 0) * 10000 + $(get_mb_ver 1) * 100 + $(get_mb_ver 2) ))" -gt \ - "$(( maxmajor * 10000 + maxminor * 100 + maxpatch ))" \ + [ "$(( $(mb_ver 0) * 10000 + $(mb_ver 1) * 100 + $(mb_ver 2) ))" -gt \ + "$(( maxmajor * 10000 + maxminor * 100 + maxpatch ))" \ ] && { info "[parser] skipping [$pname] as current version is higher than patch version clamp" continue ; }