diff --git a/bin/cpu-freq b/bin/cpu-freq index ee3a5055..4ca508a8 100755 --- a/bin/cpu-freq +++ b/bin/cpu-freq @@ -22,6 +22,10 @@ if [ "$1" = "--detail" ]; then exit 0 fi -speed=`egrep -i -m 1 "^cpu MHz|^clock|^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }'` +if [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then + speed=`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq | awk '{ printf "%.1f", $1 / 1000000 }'` +else + speed=`egrep -i -m 1 "^cpu MHz|^clock|^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }'` +fi [ -n "$speed" ] && printf "\005{= cW}%sGHz\005{-} " $speed diff --git a/byobu-export b/byobu-export index edab2a46..a94fd464 100755 --- a/byobu-export +++ b/byobu-export @@ -65,9 +65,11 @@ choose() { fi count=`expr $count + 1` if ! test $selected -gt 0 2>/dev/null; then - read -p "`gettext 'Choose'` [1 -$i]: " -r selected + echo -n "`gettext 'Choose'` [1 -$i]: " + selected=`head -n1` elif ! test $selected -le $i 2>/dev/null; then - read -p "`gettext 'Choose'` [1 -$i]: " -r selected + echo -n "`gettext 'Choose'` [1 -$i]: " + selected=`head -n1` else break fi @@ -183,7 +185,8 @@ else echo "$file" | grep -qs "\.tar\.gz$" || error "Target file must be a '.tar.gz' archive" if [ -e "$file" ]; then echo `gettext "File exists"` " [$file]" - read -p "`gettext 'Remove file? [y/N] '`" -r remove + echo -n "`gettext 'Remove file? [y/N] '`" + remove=`head -n1` if [ "$remove" = "Y" -o "$remove" = "y" ]; then rm -f "$file" else diff --git a/debian/changelog b/debian/changelog index 9023a75d..855dd3a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,11 +8,13 @@ byobu (2.11) unreleased; urgency=low .hushlogin to prevent double-printing of motd * bin/network-*, byobu.1: allow monitored network interface overrides in ~/.byobu/network-interface, update manpage accordingly, LP: #386364 + * bin/cpu-freq, byobu-export, select-screen-profile: fix bashisms + on the read command, Debian Bug (closes: #530989) [ Ciemon Dunville ] * byobu.1: Simply added a SEE ALSO to byobu.1 - -- Dustin Kirkland Fri, 12 Jun 2009 12:36:51 -0500 + -- Dustin Kirkland Mon, 15 Jun 2009 21:21:42 -0500 byobu (2.10-0ubuntu1) karmic; urgency=low diff --git a/select-screen-profile b/select-screen-profile index 9854859e..326d56c7 100755 --- a/select-screen-profile +++ b/select-screen-profile @@ -101,9 +101,11 @@ prompt() { if [ -z "$selected" -a ! -z "$simple" ]; then selected="$simple" elif ! test $selected -gt 0 2>/dev/null; then - read -p "`gettext 'Choose'` 1-$i [$simple]: " -r selected + echo -n "`gettext 'Choose'` 1-$i [$simple]: " + selected=`head -n1` elif ! test $selected -le $i 2>/dev/null; then - read -p "`gettext 'Choose'` 1-$i [$simple]: " -r selected + echo -n "`gettext 'Choose'` 1-$i [$simple]: " + selected=`head -n1` else break fi