merge upstream

[spectrwm.git] / baraction.sh

diff --git a/baraction.sh b/baraction.sh
index 7455219..77c7454 100644 (file)
--- a/baraction.sh
+++ b/baraction.sh
@@ -1,18 +1,17 @@
 #!/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  "
 }
 
@@ -93,7 +92,7 @@ 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_cpu $REPLY
@@ -101,6 +100,6 @@ while :; do
                        print_apm $APM_DATA
                        echo ""
                fi
-               I=$(( ${I} + 1 ));
+               I=$(( ( ${I} + 1 ) % 22 ));
        done
 done