dist: adjust script imports to be able to use /usr/libexec

In order to make installation easier for distributions, make all script imports based on a single variable that distributions can adjust based on how the script is packaged for each distribution. Ideally we would actually install the script in /usr/libexec rather than / in our Dockerfile, but this is a simpler fix that still lets you run the script from the repo directory. Signed-off-by: Aleksa Sarai <[email protected]>
docker · Oct 18, 2024 · a18798f · a18798f
1 parent 5c42b8a
commit a18798f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/docker-bench-security.sh b/docker-bench-security.sh
@@ -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
@@ -99,7 +101,7 @@ do
 done
 
 # Load output formating
-. ./functions/output_lib.sh
+. $LIBEXEC/functions/output_lib.sh
 
 yell_info
 
@@ -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