Merge branch 'ut-disable-dl-ossl3-shellcheck' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-ut-disable-dl-ossl3-shellcheck

Signed-off-by: Richard T Bonhomme <[email protected]>

Author: TinCanTech

ChangeLog

@@ -2,6 +2,7 @@ Easy-RSA 3 ChangeLog
 
 3.2.2 (TBD)
 
+   * op-test.sh: Disable download ossl3 and shellcheck binaries (473c43b) (#1284)
    * Forbid self-signed certificate from being expired/renewed/revoked (ab45ae7) (#1274)
    * Rename global option --ssl-conf (DEPRECATED) to --ssl-cnf (c788423) (#1270)
    * bugfix: Save and Restore $EASYRSA_SSL_CONF for compound commands (7cdb14d) (#1270)

op-test.sh

@@ -102,7 +102,7 @@ curl_it () {
 # RUN unit test
 run_unit_test ()
 {
-	if [ "${utest_bin_ok}" ] && [ "${ssl_bin_ok}" ]; then
+	if [ "${utest_bin_ok}" ]; then
 
 		# Start unit tests
 		log ">>> BEGIN unit tests:"
@@ -228,7 +228,8 @@ download_unit_test_help () {
 
 # Run shellcheck
 run_shellcheck () {
-	if [ "$enable_shellcheck" ] && [ "$sc_bin_ok" ] && [ "$EASYRSA_NIX" ]; then
+	sc_bin=shellcheck
+	if [ "$enable_shellcheck" ] && [ "$EASYRSA_NIX" ]; then
 		# shell-check easyrsa3/easyrsa
 		if [ -e easyrsa3/easyrsa ]; then
 			if "${sc_bin}" -s sh -S warning -x easyrsa3/easyrsa; then
@@ -397,7 +398,7 @@ while [ -n "$1" ]; do
 	-v)					verb='-v' ;;
 	-vv)				verb='-vv' ;;
 	-sc)				enable_shellcheck=1 ;;
-	-o3)				enable_openssl3=1 ;;
+	-o3)				: ;; # ignored
 	-p)					use_passwords='-p' ;;
 	-dr)				dry_run=1 ;;
 	-nt|--no-test)		unset -v enable_unit_test ;;
@@ -452,8 +453,8 @@ ssl_hash='SHA256(openssl)= 85b562891087d4c64868d8d1f0a381407d8e23fb66c37ce9baad5
 
 # Here we go ..
 
-download_shellcheck
-download_opensslv3
+#download_shellcheck
+#download_opensslv3
 download_unit_test
 download_unit_test_help