diff --git a/warden3/contrib/warden_ra/warden_apply.sh b/warden3/contrib/warden_ra/warden_apply.sh index 68ec6066513fddead24d99f04808f72b7200b7fb..3d53cfa59406892fb55e3c030f6c55c2a20f9447 100755 --- a/warden3/contrib/warden_ra/warden_apply.sh +++ b/warden3/contrib/warden_ra/warden_apply.sh @@ -15,8 +15,9 @@ function flee { echo -e "$1"; exit $2; } [ -z "$client" -o -z "$password" ] && flee "Usage: ${0%.*} client.name password" 255 -openssl version >/dev/null 2>&1 || flee "Haven't found 'openssl' binary." -curl --version >/dev/null 2>&1 || flee "Haven't found 'curl' binary." +for n in openssl curl; do + command -v "$n" 2>/dev/null || flee "Haven't found $n binary." +done for n in "$csr" "$key" "$cert"; do [ -e "$n" ] && flee "$n already exists, I won't overwrite, move them away first, please." 254 done