From 5bdb9cb535da0b051411ca1b101cf17a26b713a6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 5 Jul 2024 10:18:49 +0000 Subject: [PATCH] make.sh: Move lfscommoncheck out of run_command We would quite likely create an infinite loop here later and so should rather treat run_command as a low-level function. Signed-off-by: Michael Tremer --- make.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/make.sh b/make.sh index ef17d7460..400f41689 100755 --- a/make.sh +++ b/make.sh @@ -774,10 +774,6 @@ run_command() { shift done - # Run the common check - lfsmakecommoncheck "${pkg}" - [ $? == 1 ] && return 0 - local command=( # Run a shell "bash" @@ -823,6 +819,10 @@ run_command() { lfsmake2() { local pkg="${1}" + # Run the common check + lfsmakecommoncheck "${pkg}" + [ $? == 1 ] && return 0 + # Run install on the package if ! run_command --chroot "${pkg}" install; then exiterror "Building ${pkg}" @@ -832,6 +832,10 @@ lfsmake2() { ipfiredist() { local pkg="${1}" + # Run the common check + lfsmakecommoncheck "${pkg}" + [ $? == 1 ] && return 0 + # Run dist on the package if ! run_command --chroot "${pkg}" dist; then exiterror "Packging ${pkg}" -- 2.39.5