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

Merge pull request #224 from PeterMosmans/cygwin-2

Browse Source 
Added check for availability oftput (Fixes #222)
This commit is contained in:
Dirk Wetter
2015-10-25 13:37:20 +01:00
parent 5fd6e28f09 62af7be5a1
commit 0009107947
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testssl.sh
View File

@@ -93,7 +93,7 @@ date --help >/dev/null 2>&1 && \
echo A | sed -E 's/A//' >/dev/null 2>&1 && \ 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
TERM_DWITH=${COLUMNS:-$(tput cols)} # 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 # ^^^ we also need to find out the length or current pos in the line
@@ -340,6 +340,8 @@ set_color_functions() {
underline="" underline=""
italic="" italic=""
# Hey wait, do we actually have tput / ncurses ?
which tput &> /dev/null || return 0
tput sgr0 &>/dev/null || linux_tput=false tput sgr0 &>/dev/null || linux_tput=false
if [[ "$COLOR" -eq 2 ]]; then if [[ "$COLOR" -eq 2 ]]; then
if $linux_tput; then if $linux_tput; then