Changes - j0ke.net Open Build Service

Changes of Revision 41

[-] [+]	Changed	_service:set_version:inventory-system.spec
@@ -1,7 +1,7 @@ %define pkgname inventory-system Name: inventory-system Release: 0 -Version: 0.0.rev1518 +Version: 0.0.rev1530 Url: http://www.linux-administrator.com/ License: GPLv2 Group: System 1 @@ -1,7 +1,7 @@ 2 %define pkgname inventory-system 3 Name: inventory-system 4 Release: 0 5 -Version: 0.0.rev1518 6 +Version: 0.0.rev1530 7 Url: http://www.linux-administrator.com/ 8 License: GPLv2 9 Group: System 10
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev1530.tar.bz2/client/inventory-system.sh ^
@@ -1,8 +1,8 @@ #!/bin/bash # Inventory System # Author: Carsten Schoene -# $LastChangedDate$ -# $Rev$ +# $LastChangedDate: 2012-07-06 21:46:15 +0200 (Fri, 06 Jul 2012) $ +# $Rev: 1530 $ # # Default options (can be changed by inventory-system.conf) DEBUG="yes" @@ -149,7 +149,7 @@ INSTMEM=`${CAT} /proc/meminfo \| ${GREP} "^MemTotal:" \| ${AWK} '{print int($2/1024)}'` ;; ) - for MODULE in `${DMIDECODE} -t memory \| ${GREP} "\sSize" \| ${GREP} -iv "No Module Installed" \| ${AWK} '{print $(NF-1)}'` + for MODULE in `${DMIDECODE} -t memory \| ${GREP} -E '\<Size:.*MB$' \| ${GREP} -iv -E '(No Module Installed\|Maximum)' \| ${AWK} '{print $(NF-1)}'` do INSTMEM=`${EXPR} ${INSTMEM} + ${MODULE}` done
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev1530.tar.bz2/server/isdf.php ^
@@ -3,8 +3,8 @@ // isdf - inventory system deployment feed // Author: Carsten Schoene // -// $LastChangedDate$ -// $Rev$ +// $LastChangedDate: 2012-07-06 21:46:15 +0200 (Fri, 06 Jul 2012) $ +// $Rev: 1530 $ */ // define our name
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev1530.tar.bz2/server/status.php ^
@@ -3,8 +3,8 @@ // isdf - inventory system webstatus // Author: Carsten Schoene // -// $LastChangedDate$ -// $Rev$ +// $LastChangedDate: 2012-07-06 21:46:15 +0200 (Fri, 06 Jul 2012) $ +// $Rev: 1530 $ */ // define our name