From 384d4074081df77d2fc3e630a9b41e3518b25cc5 Mon Sep 17 00:00:00 2001 From: Eric F Crist Date: Tue, 12 Dec 2017 19:36:18 -0600 Subject: [PATCH] Correct "local" removal errors Also, update the README to indicate master is development. People don't seem to understand that. Resolves #167 Signed-off-by: Eric F Crist --- README.md | 7 ++++++- easyrsa3/easyrsa | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index acb846a..512ea98 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,12 @@ You can also try IRC at Freenode/#openvpn # Branch structure The easy-rsa master branch is currently tracking development for the 3.x release -cycle. The prior 2.x and 1.x versions are available as release branches for +cycle. Please note that, at any given time, master may be broken. Feel free to +create issues against master, but have patience when using the master branch. It +is recommended to use a release, and priority will be given to bugs identified in +the most recent release. + +The prior 2.x and 1.x versions are available as release branches for tracking and possible back-porting of relevant fixes. Branch layout is: master <- 3.x, at present diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 6241573..5707a7b 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -261,7 +261,10 @@ BEGIN {IGNORECASE=1; r=2} # returns without prompting in EASYRSA_BATCH confirm() { [ $EASYRSA_BATCH ] && return - prompt="$1" value="$2" msg="$3" input + prompt="$1" + value="$2" + msg="$3" + input print " $msg