select_vars(): Minor improvements

Remove unnecessary check for 'EASYRSA_VARS_FILE is unset', which is
confirmed by the first function 'if'.

Only quote parameter expansion and allow editor to show fixed values.

Move 'set_var' command above 'verbose' output.

Signed-off-by: Richard T Bonhomme <[email protected]>

Author: TinCanTech

easyrsa3/easyrsa

@@ -5498,48 +5498,38 @@ select_vars() {
 
 		# User specified PKI; if vars exists, use it ONLY
 		if [ "$EASYRSA_PKI" ]; then
-			if [ -f "$EASYRSA_PKI/vars" ]; then
+			if [ -f "$EASYRSA_PKI"/vars ]; then
+				set_var EASYRSA_VARS_FILE "$EASYRSA_PKI"/vars
 				verbose "select_vars: source EASYRSA_PKI/vars"
-				set_var EASYRSA_VARS_FILE "$EASYRSA_PKI/vars"
 			fi
 		fi
 
 		# User specified EASYRSA; if vars exists, use it ONLY
 		if [ "$EASYRSA" ]; then
-			if [ -f "$EASYRSA/vars" ]; then
+			if [ -f "$EASYRSA"/vars ]; then
+				set_var EASYRSA_VARS_FILE "$EASYRSA"/vars
 				verbose "select_vars: EASYRSA/vars"
-				set_var EASYRSA_VARS_FILE "$EASYRSA/vars"
 			fi
 		fi
 
 		# Default PKI; if vars exists, use it ONLY
-		if [ -f "$PWD/pki/vars" ] && \
+		if [ -f "$PWD"/pki/vars ] && \
 			[ -z "$EASYRSA_PKI" ] && \
 			[ -z "$EASYRSA" ]
 		then
-			# Prevent vars from changing expected PKI.
+			# Prevent vars from changing 'expected' PKI.
 			# A vars in the PKI MUST always imply EASYRSA_PKI
-			# This is NOT backward compatible
-			# Use expected value comparison for v3.1.7
-			if [ -z "$EASYRSA_VARS_FILE" ]; then
-				expected_EASYRSA="$PWD"
-				expected_EASYRSA_PKI="$PWD/pki"
-			fi
-
-			# Use this for v3.2.0
-			# If the pki/vars sets a different PKI then
-			# there will be no PKI in the default /pki
-			#set_var EASYRSA "$PWD"
-			#set_var EASYRSA_PKI "$EASYRSA/pki"
+			expected_EASYRSA="$PWD"
+			expected_EASYRSA_PKI="$PWD"/pki
 
+			set_var EASYRSA_VARS_FILE "$PWD"/pki/vars
 			verbose "select_vars: PWD/pki/vars"
-			set_var EASYRSA_VARS_FILE "$PWD/pki/vars"
 		fi
 
 		# Default working dir; if vars exists, use it ONLY
-		if [ -f "$PWD/vars" ]; then
+		if [ -f "$PWD"/vars ]; then
+			set_var EASYRSA_VARS_FILE "$PWD"/vars
 			verbose "select_vars: PWD/vars"
-			set_var EASYRSA_VARS_FILE "$PWD/vars"
 		fi
 	fi