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

Merge pull request #6729 from Security-Onion-Solutions/fix/ub1804ssl

Browse Source 
change exitCode to exitcode. set exitcode to 1 if failed output found
This commit is contained in:
Josh Patterson
2021-12-30 11:38:32 -05:00
committed by GitHub
parent 78eda75c0f d274615376
commit 064355dfb5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
salt/common/tools/sbin/so-common
View File

@@ -309,21 +309,21 @@ retry() {
echo "Results: $output ($exitcode)"
if [ -n "$expectedOutput" ]; then
if [[ "$output" =~ "$expectedOutput" ]]; then
return $exitCode
return $exitcode
else
echo "Expected '$expectedOutput' but got '$output'"
fi
elif [ -n "$failedOutput" ]; then
if [[ "$output" =~ "$failedOutput" ]]; then
echo "Found failed output '$failedOutput' in '$output'"
if [[ $exitcode -eq 0 ]]; then
exitcode="${exitcode} (This is 0, but we found '$failedOutput' in the output.)"
fi
echo "Found failed output '$failedOutput' in '$output'. Setting exitcode to 1."
if [[ $exitcode -eq 0 ]]; then
exitcode=1
fi
else
return $exitCode
return $exitcode
fi
elif [[ $exitcode -eq 0 ]]; then
return $exitCode
return $exitcode
fi
echo "Command failed with exit code $exitcode; will retry in $sleepDelay seconds ($attempt / $maxAttempts)..."
sleep $sleepDelay