openvpn.sh modify for dperson#79

hansbogert · Aug 16, 2017 · 1da482f · 1da482f
1 parent d7d63f5
commit 1da482f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/openvpn.sh b/openvpn.sh
@@ -23,10 +23,10 @@ auth="$dir/vpn.cert_auth"
 conf="$dir/vpn.conf"
 cert="$dir/vpn-ca.crt"
 file="$dir/.firewall"
-[[ -f $conf ]] || { [[ $(ls $dir/*.{conf,ovpn} 2>&- | wc -w) -eq 1 ]] &&
-            conf=$(ls $dir/*.{conf,ovpn} 2>&-); }
-[[ -f $cert ]] || { [[ $(ls $dir/*.{cert,crt} 2>&- | wc -w) -eq 1 ]] &&
-            cert=$(ls $dir/*.{cert,crt} 2>&-); }
+[[ -f $conf ]] || { [[ $(ls $dir/*|egrep '\.(conf|ovpn)$' 2>&-|wc -w) -eq 1 ]]&&
+            conf=$(ls $dir/* | egrep '\.(conf|ovpn)$' 2>&-); }
+[[ -f $cert ]] || { [[ $(ls $dir/* | egrep '\.ce?rt$' 2>&- | wc -w) -eq 1 ]] &&
+            cert=$(ls $dir/* | egrep '\.ce?rt$' 2>&-); }
 
 ### cert_auth: setup auth passwd for accessing certificate
 # Arguments: