diff --git a/bin/arch b/bin/arch index 521b1a64..8d93dfa1 100755 --- a/bin/arch +++ b/bin/arch @@ -21,4 +21,4 @@ p="arch" grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0 -uname -m +printf "%s " $(uname -m) diff --git a/bin/cpu-freq b/bin/cpu-freq index 01c36ba9..33aa567d 100755 --- a/bin/cpu-freq +++ b/bin/cpu-freq @@ -25,7 +25,7 @@ mhz=`grep -m 1 "^cpu MHz" /proc/cpuinfo | awk -F"[:.]" '{print $2}'` || mhz=`gre if [ $mhz -ge 1000 ]; then ghz=$(echo $mhz | awk '{ printf "%.2f", $1 / 1000 }') - printf "\005{=b cW}%sGHz\005{-} " $ghz + printf "\005{= cW}%sGHz\005{-} " $ghz else - printf "\005{=b cW}%sMHz\005{-} " $mhz + printf "\005{= cW}%sMHz\005{-} " $mhz fi diff --git a/bin/hostname b/bin/hostname index 11855b87..4111a196 100755 --- a/bin/hostname +++ b/bin/hostname @@ -23,4 +23,4 @@ grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0 at= grep -qs "^whoami=1$" "$HOME/.screen-profiles/status" && at="@" -printf "\005{=b }%s%s\005{-}" "$at" $(hostname -s) +printf "\005{= }%s%s\005{-}" "$at" $(hostname -s) diff --git a/bin/mem-available b/bin/mem-available index 294c616f..1ec44599 100755 --- a/bin/mem-available +++ b/bin/mem-available @@ -32,4 +32,4 @@ elif [ $mem -ge 1024 ]; then else mem="$mem""KB" fi -printf "\005{=b gW}%s\005{-}%s" "$mem$comma" "$whitespace" +printf "\005{= gW}%s\005{-}%s" "$mem$comma" "$whitespace" diff --git a/bin/mem-used b/bin/mem-used index f8c9d1f1..d3c74a4a 100755 --- a/bin/mem-used +++ b/bin/mem-used @@ -21,4 +21,4 @@ p="mem-used" grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0 -free | awk '/buffers\/cache:/ {printf "\005{=b gW}%.0f%%\005{-} ", 100*$3/($3 + $4)}' +free | awk '/buffers\/cache:/ {printf "\005{= gW}%.0f%%\005{-} ", 100*$3/($3 + $4)}' diff --git a/bin/processes b/bin/processes index f5396f2c..cb42b96a 100755 --- a/bin/processes +++ b/bin/processes @@ -21,4 +21,4 @@ p="processes" grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0 -printf "\005{=b }%s&\005{-} " $(ps -e | wc -l) +printf "\005{= yk}%s&\005{-} " $(ps -e | wc -l) diff --git a/bin/whoami b/bin/whoami index 9356d2ab..13d78a17 100755 --- a/bin/whoami +++ b/bin/whoami @@ -21,4 +21,4 @@ p="whoami" grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0 -printf "\005{=b }%s\005{-}" $(whoami) +printf "\005{= }%s\005{-}" $(whoami) diff --git a/debian/changelog b/debian/changelog index 78c28b89..45727201 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,14 +6,17 @@ screen-profiles (1.43) unreleased; urgency=low * bin/*, profiles/profile.skel: make all status scripts handle their own colors and trailing whitespace; this should help alleviate the 16-color-change limitation on un-patched screens; it also simplifies - the hardstatus string significantly + the hardstatus string significantly; reserve bold text for status + items that require an action (reboot, updates) + * profiles/profile.skel: move reboot-required and updates-available to + the early part of the status string, since these require action [ Raphaƫl Pinson and Dustin Kirkland ] * bin/battery, bin/users, bin/uptime, profiles/common, screen-profiles: added new status items for battery state, number of users, and system uptime - -- Dustin Kirkland Fri, 03 Apr 2009 12:23:14 -0500 + -- Dustin Kirkland Fri, 03 Apr 2009 12:42:53 -0500 screen-profiles (1.42-0ubuntu1) jaunty; urgency=low diff --git a/po/es.po b/po/es.po index 9ab97eaf..cf2cfac3 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-03 12:25-0500\n" +"POT-Creation-Date: 2009-04-03 12:41-0500\n" "PO-Revision-Date: 2008-12-22 01:01-0500\n" "Last-Translator: Nicolas Valcarcel \n" "Language-Team: LANGUAGE \n" diff --git a/po/fr.po b/po/fr.po index c4866e13..6be18c0c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-03 12:25-0500\n" +"POT-Creation-Date: 2009-04-03 12:41-0500\n" "PO-Revision-Date: 2008-12-17 23:42+0100\n" "Last-Translator: Nicolas Barcet \n" "Language-Team: LANGUAGE \n" diff --git a/po/screen-profiles.pot b/po/screen-profiles.pot index 4ffed56c..26eaf2f6 100644 --- a/po/screen-profiles.pot +++ b/po/screen-profiles.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-03 12:25-0500\n" +"POT-Creation-Date: 2009-04-03 12:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/profiles/profile.skel b/profiles/profile.skel index fb1273bb..6852a698 100644 --- a/profiles/profile.skel +++ b/profiles/profile.skel @@ -26,7 +26,7 @@ source /usr/share/screen-profiles/profiles/common caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{= Wk}%110`%109`%111`" # Status string, last line -hardstatus string '%{= Wk}%99`%{= Wk} %100`%112`%= %115`%114`%116`%108`%113`%102`%101`%106`%104`%103`%105`%107`%Y-%m-%d %0c:%s' +hardstatus string '%{= Wk}%99`%{= Wk} %100`%112`%102`%101`%= %115`%114`%108`%113`%116`%106`%104`%103`%105`%107`%Y-%m-%d %0c:%s' # NOTE: Older version of screen have an arbitrary limit of only being able # to change colors 16 times in this 'hardstatus string'.