From f4a604438d3ce5fe67a1f4db956dc42fc4ae5588 Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Sat, 13 Aug 2022 20:40:57 +0100
Subject: [PATCH 1/2] Allow vars file to exist in current directory (Fix
 make-cadir)

The utility script 'make-cadir' creates a CA directory with a vars file.
This vars file conflicts with the preferred PKI-vars file.

This patch changes 'init-pki' to allow make-cadir vars file to over-ride
the preferred PKI-vars file, without error.

Closes: #633

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
---
 easyrsa3/easyrsa | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 46de7dd..525a116 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -977,7 +977,7 @@ and initialize a fresh PKI here."
 Your newly created PKI dir is:
 * $EASYRSA_PKI"
 
-	if [ "$user_vars_true" ]; then
+	if [ "$user_vars_true" ] || [ "$old_vars_true" ]; then
 		: # ok - No message required
 	else
 		message "\
@@ -1079,12 +1079,18 @@ install_data_to_pki () {
 	fi
 
 	# Create PKI/vars from PKI/example
+	unset -v old_vars_true
 	case "$context" in
 	init-pki)
-		if [ -e "${EASYRSA_PKI}/${vars_file_example}" ]; then
-			[ -e "${EASYRSA_PKI}/${vars_file}" ] || \
-				cp "${EASYRSA_PKI}/${vars_file_example}" \
-					"${EASYRSA_PKI}/${vars_file}" || :
+		if [ -e ./vars ]; then
+			# If the old vars exists then do nothing
+			old_vars_true=1
+		else
+			if [ -e "${EASYRSA_PKI}/${vars_file_example}" ]; then
+				[ -e "${EASYRSA_PKI}/${vars_file}" ] || \
+					cp "${EASYRSA_PKI}/${vars_file_example}" \
+						"${EASYRSA_PKI}/${vars_file}" || :
+			fi
 		fi
 	;;
 	vars-setup)

From 20f7aaa9c6727389c40970cd0e6ca28bd05f306a Mon Sep 17 00:00:00 2001
From: Richard T Bonhomme <tincantech@protonmail.com>
Date: Sat, 13 Aug 2022 21:16:58 +0100
Subject: [PATCH 2/2] init-pki: Re-order locations of required data files

Prefer /usr/local/share over /usr/share
and move /etc/easy-rsa to last place.

Tidy up a 'case', no functional change.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
---
 easyrsa3/easyrsa | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 525a116..49a1259 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -1038,11 +1038,11 @@ install_data_to_pki () {
 
 	# Find and copy data-files, in specific order
 	for area in \
-		'/etc/easy-rsa' \
-		'/usr/share/easy-rsa' \
 		'/usr/local/share/easy-rsa' \
+		'/usr/share/easy-rsa' \
 		"$PWD" \
 		"${0%/*}" \
+		'/etc/easy-rsa' \
 		# EOL - # Add more distros here
 	do
 		# Omitting "$vars_file"
@@ -4747,9 +4747,12 @@ cmd="$1"
 # This avoids unnecessary warnings and notices
 case "$cmd" in
 	init-pki|clean-all|""|help|-h|--help|--usage|version)
-		unset -v pki_is_required; no_pki_required=1 ;;
+		no_pki_required=1
+		unset -v pki_is_required
+	;;
 	*)
-		pki_is_required=1; unset -v no_pki_required
+		pki_is_required=1
+		unset -v no_pki_required
 esac
 
 # Intelligent env-var detection and auto-loading: