Merge pull request #705 from dcooper16/read_tls_data

Don't read tls_data.txt inside function
This commit is contained in:
Dirk Wetter 2017-04-11 18:40:01 +02:00 committed by GitHub
commit 3820e2c25c

View File

@ -10385,8 +10385,6 @@ get_install_dir() {
outln
ignore_no_or_lame "Type \"yes\" to ignore this warning and proceed at your own risk" "yes"
[[ $? -ne 0 ]] && exit -2
else
. $TLS_DATA_FILE
fi
}
@ -12451,6 +12449,7 @@ lets_roll() {
json_header
csv_header
get_install_dir
[[ -r "$TLS_DATA_FILE" ]] && . $TLS_DATA_FILE
set_color_functions
maketempf
find_openssl_binary