diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2019-12-29 01:26:56 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-03-27 19:32:36 -0400 |
commit | 6b779d45b097980e75738512fd2eda2ead54bb22 (patch) | |
tree | 7febff4d1629f1195c10508c4760bdc98c9a0d09 /configs | |
parent | 96b03cc814b6930421c472f96ec41d4ed3aa904c (diff) |
refactor "Nothing to do" checks
Diffstat (limited to 'configs')
-rwxr-xr-x | configs/profile/build.sh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 578681f..ef40890 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -468,16 +468,17 @@ fi # detect previously completed build prefix=${work_dir}/build.make_ is_done=1 -[ ! -f ${prefix}pacman_conf_${arch} -o ! -f ${prefix}boot_extra_${arch} -o \ - ! -f ${prefix}syslinux_${arch} -o ! -f ${prefix}isolinux_${arch} -o \ - ! -f ${prefix}aitab_${arch} -o ! -f ${prefix}iso_${arch} ] && \ - is_done=0 -for arch in ${archs}; do - [ ! -f ${prefix}basefs_${arch} -o ! -f ${prefix}packages_${arch} -o \ - ! -f ${prefix}setup_mkinitcpio_${arch} -o ! -f ${prefix}customize_root_image_${arch} -o \ - ! -f ${prefix}boot_${arch} -o ! -f ${prefix}prepare_${arch} ] && \ - is_done=0 +single_pass_build_steps='boot_extra syslinux isolinux aitab iso' +for build_step in $single_pass_build_steps +do [ -f "${prefix}${build_step}_${arch}" ] || is_done=0 +done +multi_pass_build_steps='pacman_conf basefs packages setup_mkinitcpio customize_root_image boot prepare' +for build_step in $multi_pass_build_steps +do for arch in ${archs} + do [ -f "${prefix}${build_step}_${arch}" ] || is_done=0 + done done + if ! (($is_done)); then LOG_STEP ${launch_msg}; else LOG_STEP "Nothing to do"; exit; fi; |