Date: Sunday, July 29, 2012 @ 16:09:51
Author: pierre
Revision: 164277
db-move: moved pkgstats from [testing] to [extra] (any)
Added:
pkgstats/repos/extra-any/PKGBUILD
(from rev 164276, pkgstats/repos/testing-any/PKGBUILD)
pkgstats/repos/extra-any/pkgstats.cron
(from rev 164276, pkgstats/repos/testing-any/pkgstats.cron)
pkgstats/repos/extra-any/pkgstats.install
(from rev 164276, pkgstats/repos/testing-any/pkgstats.install)
pkgstats/repos/extra-any/pkgstats.sh
(from rev 164276, pkgstats/repos/testing-any/pkgstats.sh)
Deleted:
pkgstats/repos/extra-any/PKGBUILD
pkgstats/repos/extra-any/pkgstats.cron
pkgstats/repos/extra-any/pkgstats.install
pkgstats/repos/extra-any/pkgstats.sh
pkgstats/repos/testing-any/
------------------+
PKGBUILD | 40 +++++++--------
pkgstats.cron | 4 -
pkgstats.install | 20 +++----
pkgstats.sh | 141 ++++++++++++++++++++++++++++++-----------------------
4 files changed, 112 insertions(+), 93 deletions(-)
Deleted: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD 2012-07-29 20:01:58 UTC (rev 164276)
+++ extra-any/PKGBUILD 2012-07-29 20:09:51 UTC (rev 164277)
@@ -1,20 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=pkgstats
-pkgver=2.1
-pkgrel=5
-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')
-source=('pkgstats.sh' 'pkgstats.cron')
-install='pkgstats.install'
-md5sums=('f63f0619b6ecd76f41de11561bf2fb1e'
- 'e86e6b9778303367f2e31f5c311da685')
-
-package() {
- install -D -m755 ${srcdir}/pkgstats.sh ${pkgdir}/usr/bin/pkgstats
- install -D -m744 ${srcdir}/pkgstats.cron
${pkgdir}/etc/cron.weekly/pkgstats
-}
Copied: pkgstats/repos/extra-any/PKGBUILD (from rev 164276,
pkgstats/repos/testing-any/PKGBUILD)
===================================================================
--- extra-any/PKGBUILD (rev 0)
+++ extra-any/PKGBUILD 2012-07-29 20:09:51 UTC (rev 164277)
@@ -0,0 +1,20 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=pkgstats
+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' 'grep')
+source=('pkgstats.sh' 'pkgstats.cron')
+install='pkgstats.install'
+md5sums=('f894fc13082459bf16070ab54ef2501b'
+ 'e86e6b9778303367f2e31f5c311da685')
+
+package() {
+ install -D -m755 ${srcdir}/pkgstats.sh ${pkgdir}/usr/bin/pkgstats
+ install -D -m744 ${srcdir}/pkgstats.cron
${pkgdir}/etc/cron.weekly/pkgstats
+}
Deleted: extra-any/pkgstats.cron
===================================================================
--- extra-any/pkgstats.cron 2012-07-29 20:01:58 UTC (rev 164276)
+++ extra-any/pkgstats.cron 2012-07-29 20:09:51 UTC (rev 164277)
@@ -1,2 +0,0 @@
-#!/bin/sh
-su -s /bin/bash -c '/usr/bin/pkgstats -q' nobody
Copied: pkgstats/repos/extra-any/pkgstats.cron (from rev 164276,
pkgstats/repos/testing-any/pkgstats.cron)
===================================================================
--- extra-any/pkgstats.cron (rev 0)
+++ extra-any/pkgstats.cron 2012-07-29 20:09:51 UTC (rev 164277)
@@ -0,0 +1,2 @@
+#!/bin/sh
+su -s /bin/bash -c '/usr/bin/pkgstats -q' nobody
Deleted: extra-any/pkgstats.install
===================================================================
--- extra-any/pkgstats.install 2012-07-29 20:01:58 UTC (rev 164276)
+++ extra-any/pkgstats.install 2012-07-29 20:09:51 UTC (rev 164277)
@@ -1,10 +0,0 @@
-post_upgrade() {
- if [ "$(vercmp $2 2.1-4)" -lt 0 ]; then
- post_install
- fi
-}
-
-post_install() {
- echo "Note: A weekly cronjob was installed to /etc/cron.weekly/pkgstats"
- echo " For more information see
https://bbs.archlinux.org/viewtopic.php?id=105431";
-}
Copied: pkgstats/repos/extra-any/pkgstats.install (from rev 164276,
pkgstats/repos/testing-any/pkgstats.install)
===================================================================
--- extra-any/pkgstats.install (rev 0)
+++ extra-any/pkgstats.install 2012-07-29 20:09:51 UTC (rev 164277)
@@ -0,0 +1,10 @@
+post_upgrade() {
+ if [ "$(vercmp $2 2.1-4)" -lt 0 ]; then
+ post_install
+ fi
+}
+
+post_install() {
+ echo "Note: A weekly cronjob was installed to /etc/cron.weekly/pkgstats"
+ echo " For more information see
https://bbs.archlinux.org/viewtopic.php?id=105431";
+}
Deleted: extra-any/pkgstats.sh
===================================================================
--- extra-any/pkgstats.sh 2012-07-29 20:01:58 UTC (rev 164276)
+++ extra-any/pkgstats.sh 2012-07-29 20:09:51 UTC (rev 164277)
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-pkgstatsver='2.1'
-showonly=false
-quiet=false
-option='-q -s -S -4'
-
-usage() {
- echo "usage: ${0} [option]"
- echo 'options:'
- echo ' -v show the version of pkgstats'
- echo ' -d enable debug mode'
- echo ' -h show this help'
- echo ' -s show what information would be sent'
- echo ' (but do not send anything)'
- echo ' -q be quiet except on errors'
- echo ''
- echo 'pkgstats sends a list of all installed packages,'
- echo 'the architecture and the mirror you are using'
- echo 'to the Arch Linux project.'
- echo ''
- echo 'Statistics are available at
https://www.archlinux.de/?page=Statistics'
-}
-
-while getopts 'vdhsq' parameter; do
- case ${parameter} in
- v) echo "pkgstats, version ${pkgstatsver}"; exit 0;;
- d) option="${option} --trace-ascii -";;
- s) showonly=true;;
- q) quiet=true;;
- *) usage; exit 1;;
- esac
-done
-
-${quiet} || echo 'Collecting data...'
-pkglist="$(mktemp --tmpdir pkglist.XXXXXX)"
-pacman -Qq > "${pkglist}"
-arch="$(uname -m)"
-mirror="$(pacman -Sddp extra/pkgstats 2>/dev/null | sed -E
's#(.*/)extra/os/.*#\1#;s#(.*://).*@#\1#')"
-
-if ${showonly}; then
- echo 'packages='
- cat "${pkglist}"
- echo ''
- echo "arch=${arch}"
- echo "pkgstatsver=${pkgstatsver}"
- echo "mirror=${mirror}"
- echo "quiet=${quiet}"
-else
- ${quiet} || echo 'Submitting data...'
- curl ${option} -H 'Expect: ' \
- -A "pkgstats/${pkgstatsver}" \
- --data-urlencode "packages@${pkglist}" \
- --data-urlencode "arch=${arch}" \
- --data-urlencode "mirror=${mirror}" \
- --data-urlencode "quiet=${quiet}" \
- 'https://www.archlinux.de/?page=PostPackageList' \
- || echo 'Sorry, data could not be sent.' >&2
-fi
-
-rm -f "${pkglist}"
Copied: pkgstats/repos/extra-any/pkgstats.sh (from rev 164276,
pkgstats/repos/testing-any/pkgstats.sh)
===================================================================
--- extra-any/pkgstats.sh (rev 0)
+++ extra-any/pkgstats.sh 2012-07-29 20:09:51 UTC (rev 164277)
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+pkgstatsver='2.3'
+showonly=false
+quiet=false
+option='-q -s -S -4'
+
+usage() {
+ echo "usage: ${0} [option]"
+ echo 'options:'
+ echo ' -v show the version of pkgstats'
+ echo ' -d enable debug mode'
+ echo ' -h show this help'
+ echo ' -s show what information would be sent'
+ echo ' (but do not send anything)'
+ echo ' -q be quiet except on errors'
+ echo ''
+ echo 'pkgstats sends a list of all installed packages,'
+ echo 'the architecture and the mirror you are using'
+ echo 'to the Arch Linux project.'
+ echo ''
+ echo 'Statistics are available at
https://www.archlinux.de/?page=Statistics'
+}
+
+while getopts 'vdhsq' parameter; do
+ case ${parameter} in
+ v) echo "pkgstats, version ${pkgstatsver}"; exit 0;;
+ d) option="${option} --trace-ascii -";;
+ s) showonly=true;;
+ q) quiet=true;;
+ *) usage; exit 1;;
+ esac
+done
+
+${quiet} || echo 'Collecting data...'
+pkglist="$(mktemp --tmpdir pkglist.XXXXXX)"
+pacman -Qq > "${pkglist}"
+moduleslist="$(mktemp --tmpdir modules.XXXXXX)"
+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
+ 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
+ echo 'packages='
+ cat "${pkglist}"
+ echo ''
+ echo 'modules='
+ cat "${moduleslist}"
+ echo ''
+ echo "arch=${arch}"
+ echo "cpuarch=${cpuarch}"
+ echo "pkgstatsver=${pkgstatsver}"
+ echo "mirror=${mirror}"
+ echo "quiet=${quiet}"
+else
+ ${quiet} || echo 'Submitting data...'
+ curl ${option} -H 'Expect: ' \
+ -A "pkgstats/${pkgstatsver}" \
+ --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' \
+ || echo 'Sorry, data could not be sent.' >&2
+fi
+
+rm -f "${pkglist}"
