# 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
}
# 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.
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
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