From 7a29079efd413a99b6ce62f5a8a52263d044c815 Mon Sep 17 00:00:00 2001 From: Eric F Crist Date: Thu, 7 Dec 2017 18:49:56 -0600 Subject: [PATCH] Replace egrep with grep -E This is an alternative to the proposed patch in #154 and is easier to read than the change. Closes #154. Signed-off-by: Eric F Crist --- ChangeLog | 4 ++++ easyrsa3/easyrsa | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a6617a6..9d54d24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Easy-RSA 3 ChangeLog +3.0.4 (TBD) + * Remove use of egrep (#154) + + 3.0.3 (2017-08-22) * Include mktemp windows binary * copy CSR extensions into signed certificate diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 21e4ba3..f4dc091 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -942,7 +942,7 @@ default_server_san() { "$EASYRSA_OPENSSL" req -in "$path" -noout -subject -nameopt sep_multiline | awk -F'=' '/^ *CN=/{print $2}' ) - echo "$cn" | egrep -q '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$' + echo "$cn" | grep -E -q '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$' if [ $? -eq 0 ]; then print "subjectAltName = IP:$cn" else