浏览代码

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

Fix install.sh/upgrade.sh for tput-less systems
Marc Cornellà 9 年之前
父节点
当前提交
fdb0e239d4
共有 2 个文件被更改,包括 3 次插入5 次删除
  1. 2 3
      tools/install.sh
  2. 1 2
      tools/upgrade.sh

+ 2 - 3
tools/install.sh

@@ -1,9 +1,8 @@
 function main() {
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
-    ncolors=$($tput colors)
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
 fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
   RED="$(tput setaf 1)"

+ 1 - 2
tools/upgrade.sh

@@ -1,8 +1,7 @@
 
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
+if which tput >/dev/null 2>&1; then
     ncolors=$(tput colors)
 fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then