nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify detecting Windows

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-04-08 20:14:46 +01:00
parent 1844ec10af
commit 29eaa061c2
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
easyrsa3/easyrsa
View File

@ -2975,29 +2975,20 @@ init-pki|clean-all) want_init_pki=1 ;;
esac esac
# Detect Windows # Detect Windows
if [ "$OS" ]; then case "$OS" in
case "$OS" in '') unset -v EASYRSA_WIN ;;
Windows_NT)
EASYRSA_WIN=Windows_NT
;;
*) EASYRSA_WIN="$OS" *) EASYRSA_WIN="$OS"
esac esac
else
unset -v EASYRSA_WIN
fi
# Detect Windows git/bash # Detect Windows git/bash
if [ "$EXEPATH" ]; then case "${EXEPATH##*\\}" in
case "${EXEPATH##*\\}" in
Git) Git)
EASYRSA_WIN_GIT_BASH=Git-bash EASYRSA_WIN_GIT_BASH=Git-bash
[ -e /usr/bin/openssl ] && set_var EASYRSA_OPENSSL /usr/bin/openssl [ -e /usr/bin/openssl ] && set_var EASYRSA_OPENSSL /usr/bin/openssl
;; ;;
'') unset -v EASYRSA_WIN_GIT_BASH ;;
*) EASYRSA_WIN_GIT_BASH="$EXEPATH" *) EASYRSA_WIN_GIT_BASH="$EXEPATH"
esac esac
else
unset -v EASYRSA_WIN_GIT_BASH
fi
# Intelligent env-var detection and auto-loading: # Intelligent env-var detection and auto-loading:
vars_setup vars_setup