CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-01-31 12:23:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix nginx merge conflicts

Browse Source
This commit is contained in:
m0duspwnens
2023-05-15 11:40:12 -04:00
parent db47256cdd 9a3c997779
commit 7a4fea7a12
46 changed files with 234 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/manager/tools/sbin/soup
View File

@@ -202,7 +202,7 @@ check_local_mods() {
default_file="${DEFAULT_SALT_DIR}${stripped_path}"
if [[ -f $default_file ]]; then
file_diff=$(diff "$default_file" "$local_file" )
if [[ $(echo "$file_diff" | grep -c "^<") -gt 0 ]]; then
if [[ $(echo "$file_diff" | grep -Ec "^[<>]") -gt 0 ]]; then
local_mod_arr+=( "$local_file" )
fi
fi