|
From: Josh L. <ru...@us...> - 2004-04-30 14:31:45
|
Update of /cvsroot/acd/acd-1/web/arch/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23705 Modified Files: memory release Log Message: - fixed a spurious use of cat - updated release for better parsing of RH AW and Fedora Core Index: memory =================================================================== RCS file: /cvsroot/acd/acd-1/web/arch/linux/memory,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** memory 12 Oct 2001 04:19:24 -0000 1.2 --- memory 30 Apr 2004 14:31:37 -0000 1.3 *************** *** 1,5 **** #!/bin/sh ! MLINE=`/bin/cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ` MEM=`dc -e "$MLINE 1024 / p"` echo "<basic_info>" --- 1,5 ---- #!/bin/sh ! MLINE=`grep MemTotal /proc/meminfo | awk '{ print $2 }' ` MEM=`dc -e "$MLINE 1024 / p"` echo "<basic_info>" Index: release =================================================================== RCS file: /cvsroot/acd/acd-1/web/arch/linux/release,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** release 2 Aug 2002 19:19:16 -0000 1.1 --- release 30 Apr 2004 14:31:37 -0000 1.2 *************** *** 1,5 **** #!/bin/sh ! REL=`cat /etc/redhat-release | sed 's/Linux release//' | sed 's/(.*)//' | sed 's/ / /'` echo " <basic_info>" echo " <osrel>$REL</osrel>" --- 1,5 ---- #!/bin/sh ! REL=`cat /etc/redhat-release | sed 's/release//'|sed 's/Linux//' | sed 's/Advanced Workstation//' | sed 's/(.*)//' | sed 's/ */ /g'` echo " <basic_info>" echo " <osrel>$REL</osrel>" |