Skip to content

Commit

Permalink
Merge pull request #559 from cyphar/dist-libexec
Browse files Browse the repository at this point in the history
dist: adjust script imports to be able to use /usr/libexec
  • Loading branch information
konstruktoid authored Oct 21, 2024
2 parents 5c42b8a + a18798f commit ff26d67
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions docker-bench-security.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@

version='1.6.0'

LIBEXEC="." # Distributions can change this to /usr/libexec or similar.

# Load dependencies
. ./functions/functions_lib.sh
. ./functions/helper_lib.sh
. $LIBEXEC/functions/functions_lib.sh
. $LIBEXEC/functions/helper_lib.sh

# Setup the paths
this_path=$(abspath "$0") ## Path of this file including filename
Expand Down Expand Up @@ -99,7 +101,7 @@ do
done

# Load output formating
. ./functions/output_lib.sh
. $LIBEXEC/functions/output_lib.sh

yell_info

Expand Down Expand Up @@ -161,8 +163,8 @@ main () {
images=$(docker images -q $LABELS| grep -v "$benchcont")
fi

for test in tests/*.sh; do
. ./"$test"
for test in $LIBEXEC/tests/*.sh; do
. "$test"
done

if [ -z "$check" ] && [ ! "$checkexclude" ]; then
Expand Down

0 comments on commit ff26d67

Please sign in to comment.