Don't use echo for data from the user.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 370bf5c0f7006a708ddf7fe1dce564b2d0fd54cd..96b18054c8232723ecb362f8929424ae51074a43 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
@@ -58,13 +66,9 @@ mkdir -p zsh/cache
 # Generate ~/.less with lesskey. Prevent cluttering ~/ by storing the history
 # file in this directory; this requires replacing the constant HISTORY_PATH in
 # lesskey.
-echo lesskey: generating .lesskey
-perl < lesskey \
-    -e 'while (<STDIN>) {
-            s/\bHISTORY_PATH\b/$ARGV[0]/;
-            print;
-        }' \
-    "`pwd`/lesshistory" \
+echo 'lesskey: generating .lesskey'
+simple_cpp <lesskey \
+    HISTORY_PATH -- "`pwd`/lesshistory" \
     | lesskey -
 chmod 0600 ~/.less
 
@@ -111,14 +115,8 @@ else
     column=
 fi
 
-generate perl shell/aliases \
-    -e 'while (<STDIN>) {
-            s/\bLS_ENV\b/$ARGV[0]/;
-            s/\bLS_PATH\b/$ARGV[1]/;
-            s/\bLS_COLOR\b/$ARGV[2]/;
-            s/\bCOLUMN\b/$ARGV[3]/;
-            print;
-        }' \
+generate shell/aliases .in simple_cpp \
+    LS_ENV LS_PATH LS_COLOR COLUMN -- \
     "$ls_env" "$ls_path" "$ls_color" "$column"
 
 # If `tig` is not available use my simple replacement.
@@ -134,7 +132,7 @@ else
     sed_i '/^alias grep=/ s/^/#/' shell/aliases
 fi
 
-generate cat screenrc .in
+generate screenrc .in cat
 # As screen-256color is not widely supported use it only on machines where the
 # matching terminfo entry is available. This also requires a terminal emulator
 # which supports 256 colors. Also used for tmux.
@@ -165,67 +163,82 @@ if terminal_available screen-256color; then
     fi
 fi
 if test -z "$use_256colors"; then
-    echo screenrc: removing 256 colors
+    echo 'screenrc: removing 256 colors'
     sed_i 's/Enable 256 color/Disable 256 color/;
            s/screen-256color/screen/' screenrc
 fi
 # Some options are only necessary when running as root. They are marked as
 # "(ROOT)".
 if test "`id -u`" -ne 0; then
-    echo screenrc: removing root options
+    echo 'screenrc: removing root options'
     grep_i -v '(ROOT)' screenrc
 fi
 # I use some features of GNU screen which are only in Git or very recent GNU
 # screen versions. Drop them on machines which have older versions. They are
 # marked as "(GIT)".
 if test ! -d "$HOME/development/shell/screen"; then
-    echo screenrc: removing Git features
+    echo 'screenrc: removing Git features'
     grep_i -v '(GIT)' screenrc
 fi
 # Rxvt doesn't need the attrcolor "fix". As I prefer rxvt assume I use it when
 # it's installed.
 if installed rxvt; then
-    echo screenrc: removing attrcolor \"fix\"
+    echo 'screenrc: removing attrcolor "fix"'
     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 perl tmux.conf ./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.
     perl ./tmux-window.pl 1 "`pwd`/tmux-window2.conf" >tmux-window1.conf
     perl ./tmux-window.pl 2                           >tmux-window2.conf
     # Set absolute path to tmux-window1.conf in tmux.conf.
-    perl <tmux.conf >tmux.conf.tmp \
-        -e 'while (<STDIN>) {
-                s/\bTMUX_WINDOW_PATH\b/$ARGV[0]/;
-                print;
-            }' \
-        "`pwd`/tmux-window1.conf"
-    mv tmux.conf.tmp tmux.conf
+    generate tmux.conf '' simple_cpp \
+        TMUX_WINDOW_PATH -- "`pwd`/tmux-window1.conf"
 
     # 256 colors not available.
     if test -z "$use_256colors"; then
-        echo tmux.conf: removing 256 colors
+        echo 'tmux.conf: removing 256 colors'
         sed_i 's/Enable 256 color/Disable 256 color/;
                s/screen-256color/screen/' tmux.conf
     fi
     # Tmux doesn't display a warning if the shell wasn't found!
     if test ! -x '/bin/zsh'; then
-        echo tmux.conf: removing /bin/zsh as shell
+        echo 'tmux.conf: removing /bin/zsh as shell'
         sed_i 's/zsh/sh/' tmux.conf
     fi
 fi
 
 # Htop overwrites the comments in its configuration file.
-generate cat htoprc .in
+generate htoprc .in cat
 
 
 # LINK SETUP