Index: /noc/nagios/status-user/finger.sh
===================================================================
--- /noc/nagios/status-user/finger.sh	(revision 1106)
+++ /noc/nagios/status-user/finger.sh	(revision 1107)
@@ -1,6 +1,8 @@
 #!/bin/bash
 
+export LINES=1000
+export COLUMNS=80
 docnagios() {
-	echo q | env TERM=ansi LINES=1000 COLUMNS=80 /usr/local/nagios/bin/cnagios -b "$@" | sed 's/
+	echo q | env TERM=ansi /usr/local/nagios/bin/cnagios -b "$@" | sed 's/
 \[B/\n/g; s/
 /\n/g' | perl -pe '
@@ -22,21 +24,30 @@
 
 read line
+line=${line%[:blank:]}
+line=${line%
+}
+
+cols=${line##*-}
+if [ "$cols" -eq "$cols" ] 2>/dev/null; then
+    export COLUMNS="$cols"
+    line=${line%-*}
+fi
 case "$line" in
-    status*)
+    status)
 	docnagios
 	;;
-    broken*)
+    broken)
 	docnagios -l w
 	;;
-    load*)
+    load)
 	docnagios -g /LOAD/
 	;;
-    scripts-user*)
+    scripts-user)
 	docnagios -g "/$(gethgmembers "scripts-user.*")/"
 	;;
-    scripts*)
+    scripts)
 	docnagios -g "/$(gethgmembers "scripts.*")/"
 	;;
-    xvm*)
+    xvm)
 	docnagios -g "/$(gethgmembers "xvm.*")/"
 	;;
@@ -51,5 +62,4 @@
 finger xvm@sipb-noc    -- only XVM servers
 EOF
-      
 	;;
 esac