removed unnecessary echo statements based on output from shellcheck "SC2005: Useless echo? Instead of 'echo $(cmd)', just use 'cmd'.

"
This commit is contained in:
Todd Swatling 2017-04-18 22:52:53 -04:00
parent 68d80ce776
commit 7a9e5127c7

View File

@ -957,17 +957,17 @@ hex2ascii() {
count_lines() { count_lines() {
#echo "${$(wc -l <<< "$1")// /}" #echo "${$(wc -l <<< "$1")// /}"
# ^^ bad substitution under bash, zsh ok. For some reason this does the trick: # ^^ bad substitution under bash, zsh ok. For some reason this does the trick:
echo $(wc -l <<< "$1") wc -l <<< "$1"
} }
count_words() { count_words() {
#echo "${$(wc -w <<< "$1")// /}" #echo "${$(wc -w <<< "$1")// /}"
# ^^ bad substitution under bash, zsh ok. For some reason this does the trick: # ^^ bad substitution under bash, zsh ok. For some reason this does the trick:
echo $(wc -w <<< "$1") wc -w <<< "$1"
} }
count_ciphers() { count_ciphers() {
echo $(wc -w <<< "${1//:/ }") wc -w <<< "${1//:/ }"
} }
actually_supported_ciphers() { actually_supported_ciphers() {
@ -5193,7 +5193,7 @@ get_cn_from_cert() {
# for e.g. russian sites -esc_msb,utf8 works in an UTF8 terminal -- any way to check platform indepedent? # for e.g. russian sites -esc_msb,utf8 works in an UTF8 terminal -- any way to check platform indepedent?
# see x509(1ssl): # see x509(1ssl):
subject="$($OPENSSL x509 -in $1 -noout -subject -nameopt multiline,-align,sname,-esc_msb,utf8,-space_eq 2>>$ERRFILE)" subject="$($OPENSSL x509 -in $1 -noout -subject -nameopt multiline,-align,sname,-esc_msb,utf8,-space_eq 2>>$ERRFILE)"
echo "$(awk -F'=' '/CN=/ { print $2 }' <<< "$subject")" awk -F'=' '/CN=/ { print $2 }' <<< "$subject"
return $? return $?
} }
@ -6146,9 +6146,9 @@ get_session_ticket_lifetime_from_serverhello() {
} }
get_san_dns_from_cert() { get_san_dns_from_cert() {
echo "$($OPENSSL x509 -in "$1" -noout -text 2>>$ERRFILE | \ $OPENSSL x509 -in "$1" -noout -text 2>>$ERRFILE | \
grep -A2 "Subject Alternative Name" | tr ',' '\n' | grep "DNS:" | \ grep -A2 "Subject Alternative Name" | tr ',' '\n' | grep "DNS:" | \
sed -e 's/DNS://g' -e 's/ //g' | tr '\n' ' ')" sed -e 's/DNS://g' -e 's/ //g' | tr '\n' ' '
} }
@ -9473,7 +9473,7 @@ run_freak() {
done done
tmln_out tmln_out
else else
echo $(actually_supported_ciphers $exportrsa_cipher_list) actually_supported_ciphers $exportrsa_cipher_list
fi fi
fi fi
debugme echo $nr_supported_ciphers debugme echo $nr_supported_ciphers