Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-21 07:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid external "/bin/pwd"

Browse Source 
.. as it may not be everywhere available, see #1521 (NixOS).

This commit replaces all instances from pwd or /bin/pwd by `pwd -P`
(-P -> no symbolic link)
This commit is contained in:
Dirk Wetter 2020-03-03 12:36:22 +01:00
parent e0c83b2a38
commit 1fb96df369
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testssl.sh
View File

@ -7293,7 +7293,7 @@ extract_certificates() {
# Place the server's certificate in $HOSTCERT and any intermediate # Place the server's certificate in $HOSTCERT and any intermediate
# certificates that were provided in $TEMPDIR/intermediatecerts.pem # certificates that were provided in $TEMPDIR/intermediatecerts.pem
savedir=$(pwd); cd $TEMPDIR savedir=$(pwd -P); cd $TEMPDIR
# http://backreference.org/2010/05/09/ocsp-verification-with-openssl/ # http://backreference.org/2010/05/09/ocsp-verification-with-openssl/
if [[ "$version" == ssl2 ]]; then if [[ "$version" == ssl2 ]]; then
awk -v n=-1 '/Server certificate/ {start=1} awk -v n=-1 '/Server certificate/ {start=1}
@ -18035,9 +18035,9 @@ find_openssl_binary() {
openssl_location="$(type -p $OPENSSL)" openssl_location="$(type -p $OPENSSL)"
[[ -n "$GIT_REL" ]] && \ [[ -n "$GIT_REL" ]] && \
cwd="$(/bin/pwd)" || \ cwd="$(pwd -P)" || \
cwd="$RUN_DIR" cwd="$RUN_DIR"
if [[ "$openssl_location" =~ $(/bin/pwd)/bin ]]; then if [[ "$openssl_location" =~ $(pwd -P)/bin ]]; then
OPENSSL_LOCATION="\$PWD/bin/$(basename "$openssl_location")" OPENSSL_LOCATION="\$PWD/bin/$(basename "$openssl_location")"
elif [[ "$openssl_location" =~ $cwd ]] && [[ "$cwd" != '.' ]]; then elif [[ "$openssl_location" =~ $cwd ]] && [[ "$cwd" != '.' ]]; then
OPENSSL_LOCATION="${openssl_location%%$cwd}" OPENSSL_LOCATION="${openssl_location%%$cwd}"