bin/battery.pl,setup.sh: Support different battery devices names.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 243dce9392647f31feec712ecbece2da9f903820..3edf5f4d15ad26460b95ee590224932238ad75bd 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -30,6 +30,17 @@ terminal_info() {
 terminal_available() {
     terminal_info "$@" > /dev/null
 }
+# Usage: <file> <name> <grep-string> <value>
+apply_optional_replacement() {
+    if test -n "$4"; then
+        echo "$1: using $2 $4"
+        generate "$1" '' simple_cpp \
+            "$3" -- "$4"
+    else
+        echo "$1: removing $2 display"
+        grep_i -v "$3" "$1"
+    fi
+}
 # Check if `infocmp` is available.
 if ! infocmp >/dev/null 2>&1; then
     echo 'Warning: `infocmp` not available! 256color checks will fail.'
@@ -176,14 +187,24 @@ 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
-fi
+# 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"
+
 
 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"
+
+    # 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.