diff options
| -rwxr-xr-x | src/chroot-tools/libremakepkg | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 22e7a7f..c979b71 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -61,12 +61,12 @@ exit_copy() { run_hook() { local hookname=$1; shift local hookvar="hook_${hookname}[@]" + local fails=() - msg "Running hook: %s" "$hookname" for hook in "${!hookvar}"; do - msg2 'hook: %s' "$hook" "$hook" "$@" || { error "result: %s" $?; fails+=("$hook"); } done + if [[ ${#fails[@]} -gt 0 ]]; then error "Failure(s) in %s: %s" "$hookname" "${fails[*]}" return 1 @@ -236,12 +236,10 @@ main() { # Build trap "exit_copy '$copydir' '$LIBREUSER'" EXIT - warning 'Entering build...' build "$copydir" "${makepkg_args[@]}" + # Post-build - warning 'Entering hook check_pkg...' run_hook check_pkg - warning 'Entering add_to_local_repo ...' add_to_local_repo "$copydir" "$copydir"/pkgdest/*.pkg.tar* } |