From ea7997214af886326cc0494111fe98f888d93671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Thu, 8 Dec 2016 21:26:15 +0100 Subject: build.sh, subr/pkg.subr: fix -r ALL. --- build.sh | 3 ++- subr/pkg.subr | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index e9aacdf8..9bc1cf89 100755 --- a/build.sh +++ b/build.sh @@ -61,7 +61,8 @@ for BUILD_TARGET_LC in $(subst_tgts ${BUILD_TARGETS_META}); do for BUILD_PACKAGE_LC in $(get_var_unsafe ${BUILD_TARGET}_PACKAGES); do BUILD_PACKAGE=$(echo ${BUILD_PACKAGE_LC} | tr a-z A-Z); if [ -n "${ARG_RESTART}" ]; then - if ! match_list ${ARG_RESTART} , ${BUILD_PACKAGE_LC}; then + if [ "${ARG_RESTART}" != "ALL" ] &&\ + ! match_list ${ARG_RESTART} , ${BUILD_PACKAGE_LC}; then log_msg vnfo "Skipped \`${BUILD_PACKAGE_LC}' (-r specified.)"; : $((BUILD_NSKIP+=1)); BUILD_SCRIPT_RC=0; continue; fi; diff --git a/subr/pkg.subr b/subr/pkg.subr index 0787394e..a3b66e2d 100644 --- a/subr/pkg.subr +++ b/subr/pkg.subr @@ -45,7 +45,10 @@ fetch_git() { }; is_build_script_done() { - if match_list "${ARG_RESTART}" , ${BUILD_PACKAGE_LC}; then + if [ "${1}" != "clean" ]\ + && [ "${ARG_RESTART}" = "ALL" ]; then + return 1; # Build + elif match_list "${ARG_RESTART}" , ${BUILD_PACKAGE_LC}; then if [ -n "${ARG_RESTART_AT}" ] \ && [ "${ARG_RESTART_AT}" != "${1}" ]; then return 0; # Skip -- cgit v1.2.3