Skip to content

GitLab

Commit fdb0e239 authored by Marc Cornellà's avatar Marc Cornellà
Browse files

Merge pull request #4507 from WhyEee/fix-no-tput 

Fix install.sh/upgrade.sh for tput-less systems
parents b3c10b92 75e619b7
Show whitespace changes
Inline Side-by-side
tools/install.sh
View file @ fdb0e239
function main() { function main() {
# Use colors, but only if connected to a terminal, and that terminal # Use colors, but only if connected to a terminal, and that terminal
# supports them. # supports them.
tput=$(which tput) if which tput >/dev/null 2>&1; then
if [ -n "$tput" ]; then ncolors=$(tput colors)
ncolors=$($tput colors)
fi fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
RED="$(tput setaf 1)" RED="$(tput setaf 1)"
......
tools/upgrade.sh
View file @ fdb0e239
# Use colors, but only if connected to a terminal, and that terminal # Use colors, but only if connected to a terminal, and that terminal
# supports them. # supports them.
tput=$(which tput) if which tput >/dev/null 2>&1; then
if [ -n "$tput" ]; then
ncolors=$(tput colors) ncolors=$(tput colors)
fi fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment