screenrc,tmux.conf: Display CPU temperature.

diff --git a/screenrc.in b/screenrc.in
index e79065e37d0fc91de027c863eca44c2566959e49..4d292d0d45022f024f179d5201a897acebaf3428 100644 (file)
--- a/screenrc.in
+++ b/screenrc.in
@@ -67,6 +67,8 @@ sorendition = Bw
 # Display current battery charge if running on a laptop. Redisplay every 3
 # minutes.
 backtick 1 180 180 $HOME/.shell/bin/battery.pl -s BATTERY # (BATTERY)
+# Display current temperature if running on a laptop. Redisplay every minute.
+backtick 2 60 60 $HOME/.shell/bin/temperature.pl -s TEMPERATURE # (TEMPERATURE)
 
 # Make sure the temporary variable we use is empty. Thanks to
 # http://gist.github.com/133000 for the idea to use setenv and to TauPan in
@@ -92,6 +94,8 @@ setenv s "$s%="  # - right align the following text
 setenv s "$s%l"  # - load average
 setenv s "$s "   # - space
 setenv s "$s%H"  # - hostname
+setenv s "$s "   # - space          (TEMPERATURE)
+setenv s "$s%2`" # - temperature    (TEMPERATURE)
 setenv s "$s "   # - space          (BATTERY)
 setenv s "$s%1`" # - battery status (BATTERY)
 hardstatus alwayslastline "$s"

diff --git a/setup.sh b/setup.sh
index 3edf5f4d15ad26460b95ee590224932238ad75bd..197263de0aca28cd92d749de5adb1d6599c19afc 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -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

diff --git a/tmux.conf.in b/tmux.conf.in
index ea82d371f34f5e081f630fa092044f3af13955f9..699458a5ab00a7523f774eda7047b769336ff0a2 100644 (file)
--- a/tmux.conf.in
+++ b/tmux.conf.in
@@ -68,6 +68,7 @@ set-option -g status-left ""
 # Current load average and hostname (#H) on the right.
 set-option -g status-right "#(uptime | sed 's/^.*load averages*: //; s/,//g') \
                             #H \
+                            #(~/.shell/bin/temperature.pl -t TEMPERATURE)\
                             #[] #(~/.shell/bin/battery.pl -t BATTERY)\
                             "