From 0db21c3dd466a554b173e46ead4feb21417a373a Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Fri, 8 Apr 2022 19:47:27 +0100 Subject: [PATCH 1/3] Detect Windows and Git-for-Windows bash Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index b65cc8e..be0e4b6 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -280,6 +280,10 @@ die() { Easy-RSA error: $1" 1>&2 + + [ "$EASYRSA_WIN" ] && print "$EASYRSA_WIN" + [ "$EASYRSA_WIN_GIT_BASH" ] && print "$EASYRSA_WIN_GIT_BASH" + exit "${2:-1}" } # => die() @@ -2262,6 +2266,7 @@ set_var() { } #=> set_var() + ############################################################################ # Upgrade v2 PKI to v3 PKI @@ -2969,6 +2974,31 @@ init-pki|clean-all) want_init_pki=1 ;; *) unset -v want_init_pki esac +# Detect Windows +if [ "$OS" ]; then + case "$OS" in + Windows_NT) + EASYRSA_WIN=Windows_NT + ;; + *) EASYRSA_WIN="$OS" + esac +else + unset -v EASYRSA_WIN +fi + +# Detect Windows git/bash +if [ "$EXEPATH" ]; then + case "${EXEPATH##*\\}" in + Git) + EASYRSA_WIN_GIT_BASH=Git-bash + [ -e /usr/bin/openssl ] && set_var EASYRSA_OPENSSL /usr/bin/openssl + ;; + *) EASYRSA_WIN_GIT_BASH="$EXEPATH" + esac +else + unset -v EASYRSA_WIN_GIT_BASH +fi + # Intelligent env-var detection and auto-loading: vars_setup From 1844ec10afc357dbdf73fa89ca756e346612f7e3 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Fri, 8 Apr 2022 20:02:30 +0100 Subject: [PATCH 2/3] Remove old comment for upgrade function Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 4 ---- 1 file changed, 4 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index be0e4b6..87c7b5f 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -3012,10 +3012,6 @@ trap "exit 3" 3 trap "exit 6" 6 trap "exit 14" 15 -# Upgrade: EasyRSA v2.x to EasyRSA v3.x -# Upgrade: EasyRSA < v3.0.6 to v3.0.6+ -#up23_manage_upgrade_23 - # determine how we were called, then hand off to the function responsible case "$cmd" in init-pki|clean-all) From 29eaa061c2d730616e351de13ae409e7146eeb49 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Fri, 8 Apr 2022 20:14:46 +0100 Subject: [PATCH 3/3] Simplify detecting Windows Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 87c7b5f..dfffbac 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -2975,29 +2975,20 @@ init-pki|clean-all) want_init_pki=1 ;; esac # Detect Windows -if [ "$OS" ]; then - case "$OS" in - Windows_NT) - EASYRSA_WIN=Windows_NT - ;; +case "$OS" in + '') unset -v EASYRSA_WIN ;; *) EASYRSA_WIN="$OS" - esac -else - unset -v EASYRSA_WIN -fi +esac # Detect Windows git/bash -if [ "$EXEPATH" ]; then - case "${EXEPATH##*\\}" in +case "${EXEPATH##*\\}" in Git) EASYRSA_WIN_GIT_BASH=Git-bash [ -e /usr/bin/openssl ] && set_var EASYRSA_OPENSSL /usr/bin/openssl ;; + '') unset -v EASYRSA_WIN_GIT_BASH ;; *) EASYRSA_WIN_GIT_BASH="$EXEPATH" - esac -else - unset -v EASYRSA_WIN_GIT_BASH -fi +esac # Intelligent env-var detection and auto-loading: vars_setup