return instead of exit
This commit is contained in:
+6
-4
@@ -37,7 +37,7 @@ function assert_supported_distro {
|
|||||||
distro=$(grep -oP '^ID=\K(.*)' /etc/os-release)
|
distro=$(grep -oP '^ID=\K(.*)' /etc/os-release)
|
||||||
>&2 echo "unsupported GNU/Linux distribution: $distro"
|
>&2 echo "unsupported GNU/Linux distribution: $distro"
|
||||||
>&2 echo 'only debian-like OR arch-like currently supported'
|
>&2 echo 'only debian-like OR arch-like currently supported'
|
||||||
exit 2
|
exit
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,13 +54,15 @@ function execute_miaou_lib {
|
|||||||
function assert_bash {
|
function assert_bash {
|
||||||
if [[ $SHELL != bash ]]; then
|
if [[ $SHELL != bash ]]; then
|
||||||
>&2 echo "you are running on SHELL=$SHELL. Bash expected!"
|
>&2 echo "you are running on SHELL=$SHELL. Bash expected!"
|
||||||
return 98
|
exit
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function sudo_root {
|
function sudo_root {
|
||||||
[[ "$UID" -ne 0 ]] && sudo -vp 'SUDO privilege required: '
|
if [[ "$UID" -ne 0 ]] && ! sudo -vp 'SUDO privilege required: '; then
|
||||||
true
|
>&2 echo "canceled"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
## MAIN
|
## MAIN
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user