[fix] Add TESTING flag to resolve merge conflicts

This commit is contained in:
William Wernert
2020-05-05 09:06:46 -04:00
parent fc2de5a384
commit aa00309f00
2 changed files with 69 additions and 66 deletions

View File

@@ -44,6 +44,9 @@ add_admin_user() {
}
add_master_hostfile() {
[ -n "$TESTING" ] && return
echo "Checking if I can resolve master. If not add to hosts file" >> "$setup_log" 2>&1
# Pop up an input to get the IP address
MSRVIP=$(whiptail --title "Security Onion Setup" --inputbox \