X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=baraction.sh;h=e87b93da5d0a816a193d22733fd5d5ebde4cabc5;hb=57bfbfcfaa04c4b29ecc8c3d18d8847d2294c9ea;hp=03c32d21f5bae481ba4f217c03a2ef843f93e95a;hpb=1984ff720fb781184a0504d151692f9432801b13;p=spectrwm.git

diff --git a/baraction.sh b/baraction.sh
index 03c32d2..e87b93d 100644
--- a/baraction.sh
+++ b/baraction.sh
@@ -1,22 +1,23 @@
 #!/bin/sh
+#
 
 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: | awk {'print $6'}`
+	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() {
@@ -74,20 +75,28 @@ print_apm() {
 	fi
 }
 
+print_cpuspeed() {
+	CPU_SPEED=`/sbin/sysctl hw.cpuspeed | cut -d "=" -f2`
+	echo -n "CPU speed: $CPU_SPEED MHz  "
+}
+
 while :; do
 	# instead of sleeping, use iostat as the update timer.
 	# cache the output of apm(8), no need to call that every second.
 	/usr/sbin/iostat -C -c 3600 |&	# wish infinity was an option
+	PID="$!"
 	APM_DATA=""
 	I=0
+	trap "kill $PID; exit" TERM
 	while read -p; do
 		if [ $(( ${I} % 1 )) -eq 0 ]; then
 			APM_DATA=`/usr/sbin/apm -alb`
 		fi
 		if [ $I -gt 2 ]; then
 			# print_date
-			# print_mem $MEM
+			print_mem $MEM
 			print_cpu $REPLY
+			print_cpuspeed
 			print_apm $APM_DATA
 			echo ""
 		fi