diff --git a/build.sh b/build.sh index dd7d0f9..0ec6516 100755 --- a/build.sh +++ b/build.sh @@ -37,20 +37,28 @@ if ((COMPRESSION_LEVEL > 9)) || ((COMPRESSION_LEVEL < 1)); then abort "COMPRESSION_LEVEL must be between 1 and 9" fi -log "**App Versions:**" -build_youtube & -build_music & -build_twitter & -build_reddit & -build_twitch & -build_tiktok & -build_spotify & -build_ticktick & -build_warn_wetter & -build_backdrops & -build_windy & +build_functions=( + build_youtube build_music + build_twitter build_reddit + build_twitch build_tiktok + build_spotify build_ticktick + build_warn_wetter build_backdrops + build_windy +) +log "**App Versions:**" +idx=0 +for f in "${build_functions[@]}"; do + ret=$($f &) + if ! ((idx % 2)); then + wait + fi + if [[ $ret != 2 ]]; then + idx=$((idx + 1)) + fi +done wait +rm -rf temp/tmp.* if [ "$BUILD_MINDETACH_MODULE" = true ]; then echo "Building mindetach module" diff --git a/utils.sh b/utils.sh index 1017e74..47a6052 100755 --- a/utils.sh +++ b/utils.sh @@ -144,6 +144,7 @@ build_rv() { if [ "${args[apkmirror_dlurl]:-}" ] && [ "${args[regexp]:-}" ]; then dl_from=apkmirror; else dl_from=uptodown; fi if [ "$mode_arg" = none ]; then + echo 2 return elif [ "$mode_arg" = module ]; then build_mode_arr=(module) @@ -153,6 +154,7 @@ build_rv() { build_mode_arr=(apk module) else echo "ERROR: undefined build mode for ${args[app_name]}: '${mode_arg}'" + echo 2 return fi