update symlink patch

This commit is contained in:
Florian Tham
2016-10-21 16:54:32 +02:00
parent 4ca4a9ac2a
commit 2c394267ce
2 changed files with 12 additions and 14 deletions

View File

@@ -1,22 +1,20 @@
diff --git a/testssl.sh b/testssl.sh
index 04b2cf4..02d246b 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -90,7 +90,7 @@ egrep -q "dev|rc" <<< "$VERSION" && \
--- testssl.sh 2016-10-21 16:46:56.391902484 +0200
+++ testssl.sh-new 2016-10-21 16:52:14.785261019 +0200
@@ -90,7 +90,7 @@
SWURL="https://testssl.sh/ "
readonly PROG_NAME=$(basename "$0")
-readonly RUN_DIR=$(dirname "$0")
+readonly RUN_DIR=$(dirname "$(readlink -e $0)")
INSTALL_DIR=""
TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}" # if you run testssl.sh from a different path you can set either TESTSSL_INSTALL_DIR
CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # or CA_BUNDLES_PATH to find the CA BUNDLES. TESTSSL_INSTALL_DIR helps you to find the RFC mapping also
MAPPING_FILE_RFC=""
OPENSSL_LOCATION=""
@@ -5391,7 +5391,7 @@ old_fart() {
# it provides "keycode/ RFC style name", see RFCs, cipher(1), www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm
@@ -7191,7 +7191,7 @@
# (mapping file provides "keycode/ RFC style name", see RFCs, cipher(1),
# www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm
get_install_dir() {
#INSTALL_DIR=$(cd "$(dirname "$0")" && pwd)/$(basename "$0")
- INSTALL_DIR=$(dirname ${BASH_SOURCE[0]})
+ INSTALL_DIR=$(dirname "$(readlink -e ${BASH_SOURCE[0]})")
- [[ -z "$TESTSSL_INSTALL_DIR" ]] && TESTSSL_INSTALL_DIR="$(dirname ${BASH_SOURCE[0]})"
+ [[ -z "$TESTSSL_INSTALL_DIR" ]] && TESTSSL_INSTALL_DIR="$(dirname "$(readlink -e ${BASH_SOURCE[0]})")"
[[ -r "$RUN_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$RUN_DIR/etc/mapping-rfc.txt"
[[ -r "$INSTALL_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$INSTALL_DIR/etc/mapping-rfc.txt"
[[ -r "$TESTSSL_INSTALL_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$TESTSSL_INSTALL_DIR/etc/mapping-rfc.txt"