setup.sh: Simplify ls color detection.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index bc8f1e231a7d14ff662483b637a71204ba6d2bf9..bc3bd2221a5cba6c6431008074a0247af1d8e2f2 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -30,8 +30,16 @@ terminal_info() {
 terminal_available() {
     terminal_info "$@" > /dev/null
 }
-grep_i() {
-    cmd_i grep "$@"
+# Usage: <file> <name> <grep-string> <value>
+apply_optional_replacement() {
+    if test -n "$4"; then
+        printf '%s: using %s %s\n' "$1" "$2" "$4"
+        generate "$1" '' simple_cpp \
+            "$3" -- "$4"
+    else
+        printf '%s: removing %s display\n' "$1" "$2"
+        grep_i -v "$3" "$1"
+    fi
 }
 # Check if `infocmp` is available.
 if ! infocmp >/dev/null 2>&1; then
@@ -74,24 +82,14 @@ fi
 # shell/aliases.in for details. Doing this here instead of in shell/aliases
 # speeds up shell starts.
 #
-# Check if colors are available.
-if ls --color >/dev/null 2>&1; then
-    ls_color=gnu
-else
-    if ls -G >/dev/null 2>&1; then
-        ls_color=cli
-    else
-        ls_color=
-    fi
-fi
 # Absolute path to `ls`.
 ls_path=`installed_path ls`
-# GNU ls with colors.
-if test "x$ls_color" = xgnu; then
+# GNU ls with colors available.
+if ls --color >/dev/null 2>&1; then
     ls_env=
     ls_color='--color'
-# Normal (BSD) ls with colors.
-elif test "x$ls_color" = xcli; then
+# Normal (BSD) ls with colors available.
+elif ls -G >/dev/null 2>&1; then
     ls_env='CLICOLOR_FORCE=1'
     ls_color='-G'
 # Simple ls with no colors.
@@ -179,14 +177,34 @@ if installed rxvt; then
     sed_i 's/attrcolor b ".I"/#attrcolor b ".I"/' screenrc
 fi
 # Display current battery charge on computers with a battery. Necessary lines
-# are marked as "(BATTERY)".
-if test ! -d /sys/class/power_supply/BAT0; then
-    echo 'screenrc: removing battery display'
-    grep_i -v '(BATTERY)' screenrc
+# are marked as "(BATTERY)". Also used for Tmux.
+battery=
+for x in /sys/class/power_supply/BAT*; do
+    test -d "$x" || continue
+    battery="$x"
+done
+apply_optional_replacement screenrc \
+    battery BATTERY "$battery"
+# Display current temperature. Necessary lines are marked as "(TEMPERATURE)".
+# Also used for Tmux.
+temperature=/sys/devices/platform/coretemp.0
+if ! test -d "$temperature"; then
+    temperature=
 fi
+apply_optional_replacement screenrc \
+    temperature TEMPERATURE "$temperature"
+
 
 if installed tmux; then
-    generate tmux.conf .in perl ./bin/remove-continuation.pl
+    generate tmux.conf .in cat
+
+    apply_optional_replacement tmux.conf \
+        battery BATTERY "$battery"
+    apply_optional_replacement tmux.conf \
+        temperature TEMPERATURE "$temperature"
+
+    # Old Tmux versions can't handle that.
+    generate tmux.conf '' ./bin/remove-continuation.pl
 
     # Add mappings to switch to windows 10-29 quickly. See tmux-window.pl for
     # details.