From f0d14d7c815e5b7a17ca190c13f0abe386d41c08 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernandez Date: Mon, 30 May 2011 11:28:28 -0500 Subject: Traps when needen on fullpkg-ng --- fullpkg-ng | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fullpkg-ng b/fullpkg-ng index 877e21f..ee503ec 100755 --- a/fullpkg-ng +++ b/fullpkg-ng @@ -177,10 +177,6 @@ function find_deps { function _pkg_build () { pushd ${build_dir} > /dev/null - # Exit loop on Ctrl+C - trap "break" INT - # Remove from queue package being built on error - trap "remove_queue" EXIT INT QUIT TERM KILL build_packages=$(sort -gr $buildorder | cut -d: -f2) while [ ${#build_packages[@]} -ge 1 ]; do build_packages=$(sort -gr $buildorder | cut -d: -f2) @@ -301,6 +297,10 @@ done } # Build only [ $build_only == 'y' ] && { + # Exit loop on Ctrl+C + trap "break" INT + # Remove from queue package being built on error + trap "remove_queue" EXIT INT QUIT TERM KILL _pkg_build exit 0 } @@ -352,6 +352,10 @@ find_deps || { msg "Building packages:" [ ! -w $queue_file ] && error "can't write queue file" +# Exit loop on Ctrl+C +trap "break" INT +# Remove from queue package being built on error +trap "remove_queue" EXIT INT QUIT TERM KILL _pkg_build echo -- cgit v1.2.3-2-g168b