From 5db88c59aae02ae5d22734c1605611e9847b9e24 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 5 Jan 2022 14:35:15 -0300 Subject: [PATCH] Swap condition blocks --- install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 220e129..76eee41 100755 --- a/install.sh +++ b/install.sh @@ -457,17 +457,17 @@ checkForSystemdUnit() { forceExit=false calcWidthAndRun "whiptail --infobox \"Waiting for the ${1} to finish. Please wait.\" 7 WIDTH" if [ "${3}" = "oneshot" ]; then - systemctl is-active --quiet ${2} - while [ $? -ne 0 ] && [ $forceExit = false ]; do - sleep 1 - systemctl is-active --quiet ${2} - done - else while [ $forceExit = false ]; do result=$(systemctl show -p ActiveState --value ${2}) [ "$result" = "activating" ] && break sleep 1 done + else + systemctl is-active --quiet ${2} + while [ $? -ne 0 ] && [ $forceExit = false ]; do + sleep 1 + systemctl is-active --quiet ${2} + done fi trap - INT }