modified find_openssl_binary() to use TESTSSL_INSTALL_DIR since get_install_dir() works very hard to determine the where testssl actually is
This commit is contained in:
parent
c4a2ba8b49
commit
ee4975ac8a
|
@ -10697,9 +10697,9 @@ find_openssl_binary() {
|
||||||
elif [[ -e "/mnt/c/Windows/System32/bash.exe" ]] && test_openssl_suffix "$(dirname "$(which openssl)")"; then
|
elif [[ -e "/mnt/c/Windows/System32/bash.exe" ]] && test_openssl_suffix "$(dirname "$(which openssl)")"; then
|
||||||
# 2. otherwise, only if on Bash on Windows, use system binaries only.
|
# 2. otherwise, only if on Bash on Windows, use system binaries only.
|
||||||
SYSTEM2="WSL"
|
SYSTEM2="WSL"
|
||||||
elif test_openssl_suffix "$RUN_DIR"; then
|
elif test_openssl_suffix "$TESTSSL_INSTALL_DIR"; then
|
||||||
: # 3. otherwise try openssl in path of testssl.sh
|
: # 3. otherwise try openssl in path of testssl.sh
|
||||||
elif test_openssl_suffix "$RUN_DIR/bin"; then
|
elif test_openssl_suffix "$TESTSSL_INSTALL_DIR/bin"; then
|
||||||
: # 4. otherwise here, this is supposed to be the standard --platform independed path in the future!!!
|
: # 4. otherwise here, this is supposed to be the standard --platform independed path in the future!!!
|
||||||
elif test_openssl_suffix "$(dirname "$(which openssl)")"; then
|
elif test_openssl_suffix "$(dirname "$(which openssl)")"; then
|
||||||
: # 5. we tried hard and failed, so now we use the system binaries
|
: # 5. we tried hard and failed, so now we use the system binaries
|
||||||
|
|
Loading…
Reference in New Issue