[Devil-linux-commit] build/scripts/scripts setup,1.20.2.1,1.20.2.2 upgrade-config,1.22.2.1,1.22.2.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16672/scripts/scripts

Modified Files:
      Tag: rel-1-2-patches
	setup upgrade-config 
Log Message:
- upgrade-config and setup now work fine over serial connections
- updated clamav to 0.83
- updated samba to 3.0.11
- updated squid to 2.5.STABLE8


Index: setup
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/setup,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -d -r1.20.2.1 -r1.20.2.2
--- setup	11 Oct 2004 13:15:12 -0000	1.20.2.1
+++ setup	20 Feb 2005 03:36:06 -0000	1.20.2.2
@@ -82,6 +82,7 @@
 
 setmenuheight () {
     let height=$(stty size|cut -f1 -d' ')-11
+    [ $height -eq -11 ] && height=13
     linecount=$(cat $TMP|wc -l)
     [ $height -gt $linecount ] && height=$linecount
 }

Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- upgrade-config	1 Aug 2004 01:18:40 -0000	1.22.2.1
+++ upgrade-config	20 Feb 2005 03:36:07 -0000	1.22.2.2
@@ -63,7 +63,9 @@
 
 setmenuheight () {
     let width=$(stty size|cut -f2 -d' ')
+    [ $width -eq 0 ] && width=80
     let height2=$(stty size|cut -f1 -d' ')-1
+    [ $height2 -eq -1 ] && height2=23
     let height=$height2-10
     linecount=$(cat $TMPD|wc -l)
     [ $height -gt $linecount ] && height=$linecount