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

Windows: improve external checks and env-var help

Browse Source 
Add test for `cat` external

Fix the env-var to read the correct EASYRSA_OPENSSL name

Signed-off-by: Josh Cepek <josh.cepek@usa.net>
This commit is contained in:
Josh Cepek 2013-12-01 14:32:55 -06:00
parent 8cf97e116f
commit dc2e6dc7dc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distro/windows/bin/easyrsa-shell-init.sh
View File

@ -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" ] || {

3
distro/windows/doc/README-Windows.txt
View File

@ -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