From 6a04028343b2943c69e86a4141ed51ef3bcd9ced Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 16 Apr 2009 12:32:58 -0500 Subject: [PATCH] * bin/cpu-freq: fix for powerpc, fix for arm * screen-profiles-status: use home bin scripts, if available first, then fallback to system-wide, allows for local overrides -- Dustin Kirkland Thu, 16 Apr 2009 12:27:13 -0500 --- bin/cpu-freq | 2 +- debian/changelog | 6 ++++-- screen-profiles-status | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/cpu-freq b/bin/cpu-freq index bd4311bf..0c39d022 100755 --- a/bin/cpu-freq +++ b/bin/cpu-freq @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -mhz=`egrep -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{print $2}'` +mhz=`egrep -i -m 1 "^cpu MHz|^clock|^bogomips" /proc/cpuinfo | awk -F"[:.]" '{print $2}'` if [ $mhz -ge 1000 ]; then speed=$(echo $mhz | awk '{ printf "%.1f", $1 / 1000 }') diff --git a/debian/changelog b/debian/changelog index c4537b94..4cc6602f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ screen-profiles (1.45) unreleased; urgency=low [ Dustin Kirkland ] - * bin/cpu-freq: fix for powerpc + * bin/cpu-freq: fix for powerpc, fix for arm * bin/uptime: don't print seconds, since we don't update often enough + * screen-profiles-status: use home bin scripts, if available first, + then fallback to system-wide, allows for local overrides [ Jon Bernard ] * debian/control: fix typo in screen-profiles-extras description - -- Dustin Kirkland Thu, 16 Apr 2009 10:15:10 -0500 + -- Dustin Kirkland Thu, 16 Apr 2009 12:27:13 -0500 screen-profiles (1.44-0ubuntu1) jaunty; urgency=low diff --git a/screen-profiles-status b/screen-profiles-status index 5e0808fc..9b923de1 100755 --- a/screen-profiles-status +++ b/screen-profiles-status @@ -21,10 +21,10 @@ renice 10 $$ >/dev/null 2>&1 || true ionice -c3 -p $$ >/dev/null 2>&1 || true -if [ -d "/var/lib/screen-profiles" ]; then - DIR="/var/lib/screen-profiles" -elif [ -d "$HOME/.screen-profiles/bin" ]; then +if [ -d "$HOME/.screen-profiles/bin" ]; then DIR="$HOME/.screen-profiles/bin" +elif [ -d "/var/lib/screen-profiles" ]; then + DIR="/var/lib/screen-profiles" else exit 1 fi