Use error function instead of interactive error in main
This commit is contained in:
parent
74cd88c33b
commit
a4c3a2cf83
19
shellpki.sh
19
shellpki.sh
|
@ -301,13 +301,7 @@ list() {
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
if [ "$(id -u)" != "0" ]; then
|
[ "$(id -u)" -eq 0 ] || error "Please become root before running ${0} !"
|
||||||
echo "Please become root before running ${0##*/}!" >&2
|
|
||||||
echo >&2
|
|
||||||
echo "Press return to continue..." >&2
|
|
||||||
read -r REPLY
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# main vars
|
# main vars
|
||||||
PREFIX="/etc/shellpki"
|
PREFIX="/etc/shellpki"
|
||||||
|
@ -324,17 +318,10 @@ main() {
|
||||||
OVPNDIR="${PREFIX}/openvpn"
|
OVPNDIR="${PREFIX}/openvpn"
|
||||||
|
|
||||||
if ! getent passwd "${PKIUSER}" >/dev/null || ! getent group "${PKIUSER}" >/dev/null; then
|
if ! getent passwd "${PKIUSER}" >/dev/null || ! getent group "${PKIUSER}" >/dev/null; then
|
||||||
echo "You must create ${PKIUSER} user and group !" >&2
|
error "You must create ${PKIUSER} user and group !"
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e "${CONFFILE}" ]; then
|
[ -e "${CONFFILE}" ] || error "${CONFFILE} is missing"
|
||||||
echo "${CONFFILE} is missing" >&2
|
|
||||||
>&2
|
|
||||||
echo "Press return to continue..." >&2
|
|
||||||
read -r REPLY
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create needed dir
|
# create needed dir
|
||||||
[ -d "${PREFIX}" ] || mkdir -p "${PREFIX}"
|
[ -d "${PREFIX}" ] || mkdir -p "${PREFIX}"
|
||||||
|
|
Loading…
Reference in a new issue