From b8c85d84964eed99cf3e4038481aeb891a210b94 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 13 Mar 2009 00:14:52 -0500 Subject: [PATCH] fix role-reversal of arch and cpu-count define arch correctly --- bin/arch | 11 +++++------ bin/cpu-count | 11 ++++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/arch b/bin/arch index 79de39cf..521b1a64 100755 --- a/bin/arch +++ b/bin/arch @@ -1,6 +1,6 @@ #!/bin/sh -e # -# cpu-count: count cpu's on a systems +# arch: print the machine architecture # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Default is "on" -p="cpu-count" -grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0 +# Default is "off" +p="arch" +grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0 -count=`grep -c "^processor.*:" /proc/cpuinfo` -[ "$count" = "1" ] || echo $count"x" +uname -m diff --git a/bin/cpu-count b/bin/cpu-count index 521b1a64..79de39cf 100755 --- a/bin/cpu-count +++ b/bin/cpu-count @@ -1,6 +1,6 @@ #!/bin/sh -e # -# arch: print the machine architecture +# cpu-count: count cpu's on a systems # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland @@ -17,8 +17,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Default is "off" -p="arch" -grep -qs "^$p=1$" "$HOME/.screen-profiles/status" || exit 0 +# Default is "on" +p="cpu-count" +grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0 -uname -m +count=`grep -c "^processor.*:" /proc/cpuinfo` +[ "$count" = "1" ] || echo $count"x"