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

[Pierre Schmitz]

    Date: Saturday, March 16, 2019 @ 18:24:28
  Author: pierre
Revision: 348525

Stop submitting modules and make use of pacman-conf

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

-------------+
 PKGBUILD    |   10 ++++------
 pkgstats.sh |   14 +++-----------
 2 files changed, 7 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-16 18:06:31 UTC (rev 348524)
+++ PKGBUILD	2019-03-16 18:24:28 UTC (rev 348525)
@@ -1,13 +1,13 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=pkgstats
-pkgver=2.3
-pkgrel=10
+pkgver=2.4
+pkgrel=1
 pkgdesc='Submit a list of installed packages to the Arch Linux project'
-url='https://bbs.archlinux.org/viewtopic.php?id=105431'
+url='https://pkgstats.archlinux.de/'
 arch=('any')
 license=('GPL')
-depends=('bash' 'curl' 'pacman' 'sed' 'coreutils' 'systemd' 'awk' 'grep')
+depends=('bash' 'curl' 'pacman' 'sed' 'coreutils' 'systemd' 'grep')
 source=(pkgstats.{sh,timer,service})
 sha256sums=('582b34ace6a37ac2330309820e8c70df65dd5c80489850789b92a50ad5120458'
             '86207164a13640edb58657f16329f60f2d84d7d3e5b9336e48aa0d607906078e'
@@ -19,5 +19,3 @@
 	install -d "$pkgdir/usr/lib/systemd/system/timers.target.wants"
 	ln -st "$pkgdir/usr/lib/systemd/system/timers.target.wants" ../pkgstats.timer
 }
-
-# vim:set noet:

Modified: pkgstats.sh
===================================================================
--- pkgstats.sh	2019-03-16 18:06:31 UTC (rev 348524)
+++ pkgstats.sh	2019-03-16 18:24:28 UTC (rev 348525)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-pkgstatsver='2.3'
+pkgstatsver='2.4'
 showonly=false
 quiet=false
 option='-q -s -S -L'
@@ -34,12 +34,8 @@
 
 ${quiet} || echo 'Collecting data...'
 pkglist="$(mktemp --tmpdir pkglist.XXXXXX)"
-moduleslist="$(mktemp --tmpdir modules.XXXXXX)"
-trap 'rm -f "${pkglist}" "${moduleslist}"' EXIT
+trap 'rm -f "${pkglist}"' EXIT
 pacman -Qq > "${pkglist}"
-if [[ -f /proc/modules ]]; then
-	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
@@ -50,15 +46,12 @@
 else
 	cpuarch=''
 fi
-mirror="$(pacman -Sddp extra/pkgstats 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1#;s#(.*://).*@#\1#')"
+mirror="$(pacman-conf --repo extra Server 2> /dev/null | head -1 | sed -E 's#(.*/)extra/os/.*#\1#;s#(.*://).*@#\1#')"
 
 if ${showonly}; then
 	echo 'packages='
 	cat  "${pkglist}"
 	echo ''
-	echo 'modules='
-	cat "${moduleslist}"
-	echo ''
 	echo "arch=${arch}"
 	echo "cpuarch=${cpuarch}"
 	echo "pkgstatsver=${pkgstatsver}"
@@ -69,7 +62,6 @@
 	curl ${option} \
 		-A "pkgstats/${pkgstatsver}" \
 		--data-urlencode "packages@${pkglist}" \
-		--data-urlencode "modules@${moduleslist}" \
 		--data-urlencode "arch=${arch}" \
 		--data-urlencode "cpuarch=${cpuarch}" \
 		--data-urlencode "mirror=${mirror}" \