Fix hung timeout when checking for sudo in deploy_linux.sh

This commit is contained in:
Mike Salvatore 2020-12-08 10:01:36 -05:00
parent 330ad6540e
commit 6f0fffee07
1 changed files with 2 additions and 3 deletions

View File

@ -10,7 +10,7 @@ is_root() {
has_sudo() { has_sudo() {
# 0 true, 1 false # 0 true, 1 false
timeout 1 sudo id && return 0 || return 1 return $(sudo -nv > /dev/null 2>&1)
} }
handle_error() { handle_error() {
@ -67,8 +67,7 @@ ISLAND_BINARIES_PATH="$ISLAND_PATH/cc/binaries"
INFECTION_MONKEY_DIR="$monkey_home/monkey/infection_monkey" INFECTION_MONKEY_DIR="$monkey_home/monkey/infection_monkey"
MONKEY_BIN_DIR="$INFECTION_MONKEY_DIR/bin" MONKEY_BIN_DIR="$INFECTION_MONKEY_DIR/bin"
HAS_SUDO=$(has_sudo) if ! has_sudo; then
if [[ ! $HAS_SUDO ]]; then
log_message "You need root permissions for some of this script operations. Quiting." log_message "You need root permissions for some of this script operations. Quiting."
exit 1 exit 1
fi fi