X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/3cd1a5315bccb23e07468e11cfafe1340ca347bf..e39267765c9ccde3dee0f79de9cce8c7655223a7:/baraction.sh

diff --git a/baraction.sh b/baraction.sh
index 1248080..77c7454 100644
--- a/baraction.sh
+++ b/baraction.sh
@@ -1,24 +1,23 @@
 #!/bin/sh
 #
-# $scrotwm$
 
 print_date() {
 	# The date is printed to the status bar by default.
 	# To print the date through this script, set clock_enabled to 0
-	# in scrotwm.conf.  Uncomment "print_date" below.
+	# in spectrwm.conf.  Uncomment "print_date" below.
 	FORMAT="%a %b %d %R %Z %Y"
 	DATE=`date "+${FORMAT}"`
 	echo -n "${DATE}     "
 }
 
 print_mem() {
-	MEM=`/usr/bin/top | grep Free: | cut -d " " -f7`
+	MEM=`/usr/bin/top | grep Free: | cut -d " " -f6`
 	echo -n "Free mem: $MEM  "
 }
 
 _print_cpu() {
 	typeset -R4 _1=${1} _2=${2} _3=${3} _4=${4} _5=${5}
-	echo -n "CPU:${_1}% User${_2}% Nice${_3}% Sys${_4}% Int${_5}% Idle     "
+	echo -n "CPU:${_1}% User${_2}% Nice${_3}% Sys${_4}% Int${_5}% Idle  "
 }
 
 print_cpu() {
@@ -78,7 +77,7 @@ print_apm() {
 
 print_cpuspeed() {
 	CPU_SPEED=`/sbin/sysctl hw.cpuspeed | cut -d "=" -f2`
-	echo -n "     CPU speed: $CPU_SPEED MHz"
+	echo -n "CPU speed: $CPU_SPEED MHz  "
 }
 
 while :; do
@@ -93,14 +92,14 @@ while :; do
 		if [ $(( ${I} % 1 )) -eq 0 ]; then
 			APM_DATA=`/usr/sbin/apm -alb`
 		fi
-		if [ $I -gt 2 ]; then
+		if [ $I -ge 2 ]; then
 			# print_date
-			# print_mem $MEM
+			print_mem $MEM
 			print_cpu $REPLY
-			print_apm $APM_DATA
 			print_cpuspeed
+			print_apm $APM_DATA
 			echo ""
 		fi
-		I=$(( ${I} + 1 ));
+		I=$(( ( ${I} + 1 ) % 22 ));
 	done
 done