Update regex check for existing clients and make it idempotent again

See https://github.com/angristan/openvpn-install/issues/652#issuecomment-650372450
This commit is contained in:
randomshell 2020-06-26 20:11:19 +00:00
parent b2888fa514
commit 106a2ce3c9

View File

@ -1068,11 +1068,10 @@ function newClient() {
read -rp "Select an option [1-2]: " -e -i 1 PASS
done
CLIENTEXISTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -c -E "/CN=$CLIENT\$")
CLIENTEXISTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -c -E "^V.*/CN=$CLIENT\$")
if [[ $CLIENTEXISTS == '1' ]]; then
echo ""
echo "The specified client CN was already found in easy-rsa, please choose another name."
exit
echo "The specified client CN was already found in easy-rsa."
else
cd /etc/openvpn/easy-rsa/ || return
case $PASS in