[arch-commits] Commit in pkgstats/trunk (PKGBUILD pkgstats.sh)

[Pierre Schmitz]

    Date: Friday, July 27, 2012 @ 11:07:02
  Author: pierre
Revision: 164214

upgpkg: pkgstats 2.3-1

send the actual cpu architecture as well

Modified:
  pkgstats/trunk/PKGBUILD
  pkgstats/trunk/pkgstats.sh

-------------+
 PKGBUILD    |    6 +++---
 pkgstats.sh |   15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-27 14:57:48 UTC (rev 164213)
+++ PKGBUILD	2012-07-27 15:07:02 UTC (rev 164214)
@@ -2,16 +2,16 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=pkgstats
-pkgver=2.2
+pkgver=2.3
 pkgrel=1
 pkgdesc='submits a list of installed packages to the Arch Linux project'
 arch=('any')
 url='https://www.archlinux.de'
 license=('GPL')
-depends=('bash' 'curl' 'pacman' 'sed' 'coreutils' 'cron' 'awk')
+depends=('bash' 'curl' 'pacman' 'sed' 'coreutils' 'cron' 'awk' 'grep')
 source=('pkgstats.sh' 'pkgstats.cron')
 install='pkgstats.install'
-md5sums=('93ab636b7a02d89ecd852e28c7e2a07c'
+md5sums=('f894fc13082459bf16070ab54ef2501b'
          'e86e6b9778303367f2e31f5c311da685')
 
 package() {

Modified: pkgstats.sh
===================================================================
--- pkgstats.sh	2012-07-27 14:57:48 UTC (rev 164213)
+++ pkgstats.sh	2012-07-27 15:07:02 UTC (rev 164214)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-pkgstatsver='2.2'
+pkgstatsver='2.3'
 showonly=false
 quiet=false
 option='-q -s -S -4'
@@ -37,9 +37,18 @@
 pacman -Qq > "${pkglist}"
 moduleslist="$(mktemp --tmpdir modules.XXXXXX)"
 if [[ -f /proc/modules ]]; then
-	cat /proc/modules | awk '{ print $1 }' > "${moduleslist}"
+	awk '{ print $1 }' /proc/modules > "${moduleslist}"
 fi
 arch="$(uname -m)"
+if [[ -f /proc/cpuinfo ]]; then
+	if grep -qE '^flags\s*:.*\slm\s' /proc/cpuinfo; then
+		cpuarch='x86_64'
+	else
+		cpuarch='i686'
+	fi
+else
+	cpuarch=''
+fi
 mirror="$(pacman -Sddp extra/pkgstats 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1#;s#(.*://).*@#\1#')"
 
 if ${showonly}; then
@@ -50,6 +59,7 @@
 	cat "${moduleslist}"
 	echo ''
 	echo "arch=${arch}"
+	echo "cpuarch=${cpuarch}"
 	echo "pkgstatsver=${pkgstatsver}"
 	echo "mirror=${mirror}"
 	echo "quiet=${quiet}"
@@ -60,6 +70,7 @@
 		--data-urlencode "packages@${pkglist}" \
 		--data-urlencode "modules@${moduleslist}" \
 		--data-urlencode "arch=${arch}" \
+		--data-urlencode "cpuarch=${cpuarch}" \
 		--data-urlencode "mirror=${mirror}" \
 		--data-urlencode "quiet=${quiet}" \
 		'https://www.archlinux.de/?page=PostPackageList' \