From 1adc6fc5c1af35db8f35bcdb09ccae2657c8b9b6 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Thu, 20 Feb 2020 10:08:26 +0000 Subject: kiss: Move hooks to function for easy reuse. This will allow for new hook additions to be single line changes. I don't know how many additional hooks we'll add or what they'll be but it's a good idea regardless. pre-update(?), post-update(?), pre-install(?), etc FossilOrigin-Name: 560d074a7685b115b4b753c6dbc1bf792485bbec3ff0e75fb81729cbbd2f26f1 --- kiss | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/kiss b/kiss index 4846875..47938e5 100755 --- a/kiss +++ b/kiss @@ -80,6 +80,14 @@ pop() { for i; do [ "$i" = "$del" ] || printf %s " $i "; done } +run_hook() { + [ "$KISS_HOOK" ] || return 0 + + log "$pkg" "Running $1 hook" + + TYPE=$1 PKG=$pkg DEST=$pkg_dir/$pkg . "$KISS_HOOK" +} + pkg_lint() { # Check that each mandatory file in the package entry exists. log "$1" "Checking repository files" @@ -570,10 +578,7 @@ pkg_build() { log "$pkg" "Starting build" - if [ "$KISS_HOOK" ]; then - log "$pkg" "Running pre-build hook" - TYPE=pre-build PKG=$pkg DEST=$pkg_dir/$pkg . "$KISS_HOOK" - fi + run_hook pre-build # Call the build script, log the output to the terminal # and to a file. There's no PIPEFAIL in POSIX shelll so @@ -600,10 +605,7 @@ pkg_build() { log "$pkg" "Successfully built package" - if [ "$KISS_HOOK" ]; then - log "$pkg" "Running post-build hook" - TYPE=post-build PKG=$pkg DEST=$pkg_dir/$pkg . "$KISS_HOOK" - fi + run_hook post-build # Create the manifest file early and make it empty. # This ensures that the manifest is added to the manifest. -- cgit v1.2.3