diff --git a/scripts/lib/action.fish b/scripts/lib/action.fish index 3e2fbd4b..fcdd351a 100644 --- a/scripts/lib/action.fish +++ b/scripts/lib/action.fish @@ -55,6 +55,8 @@ function runSetupUserAction -V dir set -l sudoConfig "/etc/sudoers.d/PortValhalla" begin + set success true + if id -u "$name" &>/dev/null echo "Setup user already exists!" else @@ -74,10 +76,15 @@ function runSetupUserAction -V dir end >"$sudoConfig" and sudo --preserve-env --set-home --user "$name" env "PATH=$PATH" $cmdline - or read -P "An error occurred! Press enter to continue: " + or begin + read -P "An error occurred! Press enter to continue: " + set success false + end + disposeAction rm "$sudoConfig" userdel -rf "$name" + success end end end