From 677ade553e9fbd734f726e661262454a0e17d727 Mon Sep 17 00:00:00 2001 From: Skileau <83423277+Skileau@users.noreply.github.com> Date: Wed, 25 Oct 2023 19:51:17 +0200 Subject: [PATCH 1/2] Fixed typo in find command. --- sources/assets/exegol/load_supported_setups.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/assets/exegol/load_supported_setups.sh b/sources/assets/exegol/load_supported_setups.sh index 33a4ee012..9785a9fb2 100755 --- a/sources/assets/exegol/load_supported_setups.sh +++ b/sources/assets/exegol/load_supported_setups.sh @@ -244,7 +244,7 @@ function deploy_bloodhound() { function trust_ca_certs_in_firefox() { colorecho "Trusting user CA certificates in Firefox" if [[ -d "$MY_SETUP_PATH/firefox/certs" ]]; then - for file in $(find -type f "$MY_SETUP_PATH/firefox/certs"); do + for file in $(find "$MY_SETUP_PATH/firefox/certs" -type f); do if [[ -f "$file" ]]; then if [[ "$file" == *.[dD][eE][rR] ]]; then local base_filename_without_extension From da3671ee376bd5c18a2f74a697c6993a04351c38 Mon Sep 17 00:00:00 2001 From: Charlie Bromberg <40902872+ShutdownRepo@users.noreply.github.com> Date: Wed, 25 Oct 2023 23:02:54 +0200 Subject: [PATCH 2/2] Update load_supported_setups.sh --- sources/assets/exegol/load_supported_setups.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/assets/exegol/load_supported_setups.sh b/sources/assets/exegol/load_supported_setups.sh index 9785a9fb2..337ef68cf 100755 --- a/sources/assets/exegol/load_supported_setups.sh +++ b/sources/assets/exegol/load_supported_setups.sh @@ -109,7 +109,7 @@ function deploy_apt() { grep -vE "^(\s*|#.*)$" <"$MY_SETUP_PATH/apt/keys.list" | while IFS= read -r key_url; do wget -nv "$key_url" -O "$tmpaptkeys/$(echo "$key_url" | md5sum | cut -d ' ' -f1).key" done - if [[ -n $(find -type f -name "*.key" "$tmpaptkeys") ]]; then + if [[ -n $(find "$tmpaptkeys" -type f -name "*.key") ]]; then gpg --no-default-keyring --keyring="$tmpaptkeys/user_custom.gpg" --batch --import "$tmpaptkeys"/*.key && gpg --no-default-keyring --keyring="$tmpaptkeys/user_custom.gpg" --batch --output /etc/apt/trusted.gpg.d/user_custom.gpg --export --yes && chmod 644 /etc/apt/trusted.gpg.d/user_custom.gpg @@ -205,7 +205,7 @@ function deploy_bloodhound_customqueries_merge() { [[ ! -d "$cq_merge_directory" ]] && cp -r /.exegol/skel/bloodhound/customqueries_merge "$cq_merge_directory" if \ [[ -f "$bh_config_homedir/customqueries.json" ]] && \ - [[ -n $(find -type f -name "*.json" "$cq_merge_directory") ]]; then + [[ -n $(find "$cq_merge_directory" -type f -name "*.json") ]]; then bqm --verbose --ignore-default --output-path "$bqm_output_file" -i "$cq_merge_directory,$bh_config_homedir/customqueries.json" fi }