Changes - j0ke.net Open Build Service

[-] [+]	Changed	_service:set_version:inventory-system.spec
@@ -1,7 +1,7 @@ %define pkgname inventory-system Name: inventory-system Release: 0 -Version: 0.0.rev1626 +Version: 0.0.rev1627 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.rev1626 6 +Version: 0.0.rev1627 7 Url: http://www.linux-administrator.com/ 8 License: GPLv2 9 Group: System 10
[-] [+]	Changed	_service:recompress:tar_scm:inventory-system-0.0.rev1627.tar.bz2/client/inventory-system.sh ^
@@ -1,8 +1,8 @@ #!/bin/bash # Inventory System # Author: Carsten Schoene -# $LastChangedDate: 2012-07-21 12:34:40 +0200 (Sat, 21 Jul 2012) $ -# $Rev: 1626 $ +# $LastChangedDate: 2012-07-22 16:26:37 +0200 (Sun, 22 Jul 2012) $ +# $Rev: 1627 $ # # Default options (can be changed by inventory-system.conf) DEBUG="yes" @@ -139,10 +139,7 @@ # get system cpu type function get_system_cpu { - CPU=`${LSHW} -quiet -C processor \| ${GREP} "version:" \| ${SORT} -u \| ${AWK} -F"version: " '{ print $NF}' \| ${SED} -e 's@\s\+@ @g'` - if [ "${CPU}" == "" ] \|\| [ "`get_system_type`" == "vmware" ]; then - CPU=`${LSHW} -quiet -C processor \| ${GREP} "product:" \| ${SORT} -u \| ${AWK} -F"product: " '{ print $NF}' \| ${SED} -e 's@\s\+@ @g'` - fi + CPU=`${LSHW} -quiet -C processor \| ${GREP} "product:" \| ${SORT} -u \| ${AWK} -F"product: " '{ print $NF}' \| ${HEAD} -n1 \| ${SED} -e 's@\s\+@ @g'` debug "SYSTEM-CPU: ${CPU}" echo ${CPU} }