Don't use echo for data from the user.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 3edf5f4d15ad26460b95ee590224932238ad75bd..96b18054c8232723ecb362f8929424ae51074a43 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -33,11 +33,11 @@ terminal_available() {
 # Usage: <file> <name> <grep-string> <value>
 apply_optional_replacement() {
     if test -n "$4"; then
-        echo "$1: using $2 $4"
+        printf '%s: using %s %s\n' "$1" "$2" "$4"
         generate "$1" '' simple_cpp \
             "$3" -- "$4"
     else
-        echo "$1: removing $2 display"
+        printf '%s: removing %s display\n' "$1" "$2"
         grep_i -v "$3" "$1"
     fi
 }
@@ -195,6 +195,14 @@ for x in /sys/class/power_supply/BAT*; do
 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
@@ -202,6 +210,8 @@ if installed tmux; then
 
     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