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

- revert part of #225

Browse Source 
- clarify name of bool var for type of tput
This commit is contained in:
Dirk
2015-11-02 10:49:40 +01:00
parent 8b54609c3d
commit 84e6be3547
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
testssl.sh
View File

@@ -94,9 +94,9 @@ echo A | sed -E 's/A//' >/dev/null 2>&1 && \
readonly HAS_SED_E=true || \ readonly HAS_SED_E=true || \
readonly HAS_SED_E=false readonly HAS_SED_E=false
if [[ $- == *i* ]]; then #Prevent tput errors if running non interactive shell if [[ $- == *i* ]]; then # Prevent tput errors if running non interactive shell
TERM_DWITH=${COLUMNS:-$(tput cols 2>/dev/null)} # for future custom line wrapping TERM_DWITH=${COLUMNS:-$(tput cols 2>/dev/null)} # for future custom line wrapping
TERM_CURRPOS=0 # ^^^ we also need to find out the length or current pos in the line TERM_CURRPOS=0
fi fi
# following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host> # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host>
@@ -326,7 +326,7 @@ pr_dquoted() { out "\"$1\""; }
### color switcher (see e.g. https://linuxtidbits.wordpress.com/2008/08/11/output-color-on-bash-scripts/ ### color switcher (see e.g. https://linuxtidbits.wordpress.com/2008/08/11/output-color-on-bash-scripts/
### http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x405.html ### http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x405.html
set_color_functions() { set_color_functions() {
local linux_tput=true local ncurses_tput=true
# empty vars if we have COLOR=0 equals no escape code: # empty vars if we have COLOR=0 equals no escape code:
red="" red=""
@@ -344,9 +344,9 @@ set_color_functions() {
# Hey wait, do we actually have tput / ncurses ? # Hey wait, do we actually have tput / ncurses ?
which tput &> /dev/null || return 0 which tput &> /dev/null || return 0
tput sgr0 &>/dev/null || linux_tput=false tput sgr0 &>/dev/null || ncurses_tput=false
if [[ "$COLOR" -eq 2 ]]; then if [[ "$COLOR" -eq 2 ]]; then
if $linux_tput; then if $ncurses_tput; then
red=$(tput setaf 1) red=$(tput setaf 1)
green=$(tput setaf 2) green=$(tput setaf 2)
brown=$(tput setaf 3) brown=$(tput setaf 3)
@@ -368,7 +368,7 @@ set_color_functions() {
fi fi
if [[ "$COLOR" -ge 1 ]]; then if [[ "$COLOR" -ge 1 ]]; then
if $linux_tput; then if $ncurses_tput; then
bold=$(tput bold) bold=$(tput bold)
underline=$(tput sgr 0 1) underline=$(tput sgr 0 1)
italic=$(tput sitm) italic=$(tput sitm)
@@ -5214,9 +5214,6 @@ get_install_dir
initialize_globals initialize_globals
parse_cmd_line "$@" parse_cmd_line "$@"
if [[ $- == *i* ]]; then #Prevent tput errors if running non interactive shell
set_color_functions
fi
find_openssl_binary find_openssl_binary
maketempf maketempf
mybanner mybanner