From dc2e6dc7dcc268393cc0ef1fa74413e17ca0000e Mon Sep 17 00:00:00 2001 From: Josh Cepek Date: Sun, 1 Dec 2013 14:32:55 -0600 Subject: [PATCH] Windows: improve external checks and env-var help Add test for `cat` external Fix the env-var to read the correct EASYRSA_OPENSSL name Signed-off-by: Josh Cepek --- distro/windows/bin/easyrsa-shell-init.sh | 6 +++--- distro/windows/doc/README-Windows.txt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/distro/windows/bin/easyrsa-shell-init.sh b/distro/windows/bin/easyrsa-shell-init.sh index 1e914d5..66568f6 100644 --- a/distro/windows/bin/easyrsa-shell-init.sh +++ b/distro/windows/bin/easyrsa-shell-init.sh @@ -14,7 +14,7 @@ export HOME="$setup_path" export ENV="/disable-env" # Verify required externals are present -extern_list="which awk cp mkdir printf rm" +extern_list="which awk cat cp mkdir printf rm" for f in $extern_list; do if ! which "${f}.exe" >/dev/null 2>&1; then echo "" @@ -42,8 +42,8 @@ set_var() { [ -r "vars" ] && EASYRSA_CALLER=1 . "vars" 2>/dev/null if [ -z "$EASYRSA_OPENSSL" ] && ! which openssl.exe >/dev/null 2>&1; then echo "WARNING: openssl isn't in your system PATH. The openssl binary must be" - echo " available in the PATH, defined in the 'vars' file, or defined in the" - echo " OPENSSL environment variable. See README-Windows.txt for more info." + echo " available in the PATH, defined in the 'vars' file, or defined in a" + echo " named environment variable. See README-Windows.txt for more info." fi [ -f "$setup_path/easyrsa" ] || { diff --git a/distro/windows/doc/README-Windows.txt b/distro/windows/doc/README-Windows.txt index 3dbefb4..1f60c28 100644 --- a/distro/windows/doc/README-Windows.txt +++ b/distro/windows/doc/README-Windows.txt @@ -25,7 +25,8 @@ Contents of this file: (1) Add the location of openssl.exe to the system PATH - (2) Define the OPENSSL env-var to reference the full path to openssl.exe + (2) Define the EASYRSA_OPENSSL env-var to reference the full path to + openssl.exe (3) Edit the vars file (copy vars.example as a starting point) as instructed in the comments