Merge pull request #559 from cyphar/dist-libexec

dist: adjust script imports to be able to use /usr/libexec
This commit is contained in:
Thomas Sjögren 2024-10-21 09:26:06 +02:00 committed by GitHub
commit ff26d67f25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -9,9 +9,11 @@
version='1.6.0' version='1.6.0'
LIBEXEC="." # Distributions can change this to /usr/libexec or similar.
# Load dependencies # Load dependencies
. ./functions/functions_lib.sh . $LIBEXEC/functions/functions_lib.sh
. ./functions/helper_lib.sh . $LIBEXEC/functions/helper_lib.sh
# Setup the paths # Setup the paths
this_path=$(abspath "$0") ## Path of this file including filename this_path=$(abspath "$0") ## Path of this file including filename
@ -99,7 +101,7 @@ do
done done
# Load output formating # Load output formating
. ./functions/output_lib.sh . $LIBEXEC/functions/output_lib.sh
yell_info yell_info
@ -161,8 +163,8 @@ main () {
images=$(docker images -q $LABELS| grep -v "$benchcont") images=$(docker images -q $LABELS| grep -v "$benchcont")
fi fi
for test in tests/*.sh; do for test in $LIBEXEC/tests/*.sh; do
. ./"$test" . "$test"
done done
if [ -z "$check" ] && [ ! "$checkexclude" ]; then if [ -z "$check" ] && [ ! "$checkexclude" ]; then