CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix if and awk

Browse Source
This commit is contained in:
m0duspwnens
2024-09-03 15:20:49 -04:00
parent 6d7b76115f
commit c20ac6c2d8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/common/tools/sbin/so-image-common
View File

@@ -148,10 +148,10 @@ update_docker_containers() {
local v1=0 local v1=0
local v2=0 local v2=0
if [[ -f "$UPDATE_DIR/salt/elasticsearch.defaults.yaml" ]]; then if [[ -f "$UPDATE_DIR/salt/elasticsearch.defaults.yaml" ]]; then
v1=$(egrep " +version: " "$UPDATE_DIR/salt/elasticsearch.defaults.yaml" | awk -F: {'print $2'} | tr -d '[:space:]') v1=$(egrep " +version: " "$UPDATE_DIR/salt/elasticsearch.defaults.yaml" | awk -F: '{print $2}' | tr -d '[:space:]')
fi fi
if [[ -f "$DEFAULT_SALT_DIR/salt/elasticsearch.defaults.yaml"]]; then if [[ -f "$DEFAULT_SALT_DIR/salt/elasticsearch.defaults.yaml" ]]; then
v2=$(egrep " +version: " "$DEFAULT_SALT_DIR/salt/elasticsearch.defaults.yaml" | awk -F: {'print $2'} | tr -d '[:space:]') v2=$(egrep " +version: " "$DEFAULT_SALT_DIR/salt/elasticsearch.defaults.yaml" | awk -F: '{print $2}' | tr -d '[:space:]')
fi fi
local highest_es_version=$(compare_es_versions "$v1" "$v2") local highest_es_version=$(compare_es_versions "$v1" "$v2")
local image=$i:$highest_es_version$IMAGE_TAG_SUFFIX local image=$i:$highest_es_version$IMAGE_TAG_SUFFIX