From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Tue, 11 Mar 2008 05:58:39 +0000 (+0000)
Subject: Set tool defaults in pkitool.
X-Git-Tag: v2.1_rc8~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4fb6d493a040c354d4d1f1a089f017db7efdb3d;p=thirdparty%2Fopenvpn.git

Set tool defaults in pkitool.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2835 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/easy-rsa/2.0/pkitool b/easy-rsa/2.0/pkitool
index 5f951622e..4e0442de1 100755
--- a/easy-rsa/2.0/pkitool
+++ b/easy-rsa/2.0/pkitool
@@ -118,6 +118,11 @@ usage()
     echo "  ./$PROGNAME client-new"
 }
 
+# Set tool defaults
+[ -n "$OPENSSL" ] || export OPENSSL="openssl"
+[ -n "$PKCS11TOOL" ] || export PKCS11TOOL="pkcs11-tool"
+[ -n "$GREP" ] || export GREP="grep"
+
 # Set defaults
 DO_REQ="1"
 REQ_EXT=""