Date: Sunday, February 17, 2019 @ 00:06:57 Author: heftig Revision: 346395
archrelease: copy trunk to extra-any Added: pkgstats/repos/extra-any/PKGBUILD (from rev 346394, pkgstats/trunk/PKGBUILD) pkgstats/repos/extra-any/pkgstats.service (from rev 346394, pkgstats/trunk/pkgstats.service) pkgstats/repos/extra-any/pkgstats.sh (from rev 346394, pkgstats/trunk/pkgstats.sh) pkgstats/repos/extra-any/pkgstats.timer (from rev 346394, pkgstats/trunk/pkgstats.timer) Deleted: pkgstats/repos/extra-any/PKGBUILD pkgstats/repos/extra-any/pkgstats.install pkgstats/repos/extra-any/pkgstats.service pkgstats/repos/extra-any/pkgstats.sh pkgstats/repos/extra-any/pkgstats.timer ------------------+ PKGBUILD | 48 +++++++--------- pkgstats.install | 3 - pkgstats.service | 18 +++--- pkgstats.sh | 158 ++++++++++++++++++++++++++--------------------------- pkgstats.timer | 17 ++--- 5 files changed, 118 insertions(+), 126 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-02-17 00:06:34 UTC (rev 346394) +++ PKGBUILD 2019-02-17 00:06:57 UTC (rev 346395) @@ -1,25 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgname=pkgstats -pkgver=2.3 -pkgrel=9 -pkgdesc='Submit 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' 'systemd' 'awk' 'grep') -source=('pkgstats.sh' - pkgstats.{timer,service}) -install='pkgstats.install' -md5sums=('0acfba6a941bdf9e6a7927f18433e091' - '4ec734d9b60c439d55db5fd779a007c8' - '5948fa6ef41d3804f7eb6980684611d6') - -package() { - install -D -m755 ${srcdir}/pkgstats.sh ${pkgdir}/usr/bin/pkgstats - install -D -m644 ${srcdir}/pkgstats.timer ${pkgdir}/usr/lib/systemd/system/pkgstats.timer - install -D -m644 ${srcdir}/pkgstats.service ${pkgdir}/usr/lib/systemd/system/pkgstats.service - install -d -m755 ${pkgdir}/usr/lib/systemd/system/timers.target.wants - ln -s ../pkgstats.timer ${pkgdir}//usr/lib/systemd/system/timers.target.wants/pkgstats.timer -} Copied: pkgstats/repos/extra-any/PKGBUILD (from rev 346394, pkgstats/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-17 00:06:57 UTC (rev 346395) @@ -0,0 +1,23 @@ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgname=pkgstats +pkgver=2.3 +pkgrel=10 +pkgdesc='Submit a list of installed packages to the Arch Linux project' +url='https://bbs.archlinux.org/viewtopic.php?id=105431' +arch=('any') +license=('GPL') +depends=('bash' 'curl' 'pacman' 'sed' 'coreutils' 'systemd' 'awk' 'grep') +source=(pkgstats.{sh,timer,service}) +sha256sums=('582b34ace6a37ac2330309820e8c70df65dd5c80489850789b92a50ad5120458' + '86207164a13640edb58657f16329f60f2d84d7d3e5b9336e48aa0d607906078e' + '986608f2fff417693b663474db3f36b8fb2ae4eb111ad177c616ce02bb431b23') + +package() { + install -D pkgstats.sh "$pkgdir/usr/bin/pkgstats" + install -Dt "$pkgdir/usr/lib/systemd/system" -m644 pkgstats.{timer,service} + 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: Deleted: pkgstats.install =================================================================== --- pkgstats.install 2019-02-17 00:06:34 UTC (rev 346394) +++ pkgstats.install 2019-02-17 00:06:57 UTC (rev 346395) @@ -1,3 +0,0 @@ -post_install() { - echo "For information about pkgstats see https://bbs.archlinux.org/viewtopic.php?id=105431" -} Deleted: pkgstats.service =================================================================== --- pkgstats.service 2019-02-17 00:06:34 UTC (rev 346394) +++ pkgstats.service 2019-02-17 00:06:57 UTC (rev 346395) @@ -1,9 +0,0 @@ -[Unit] -Description=Submit pkgstats -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/pkgstats -q -User=nobody -Group=nobody Copied: pkgstats/repos/extra-any/pkgstats.service (from rev 346394, pkgstats/trunk/pkgstats.service) =================================================================== --- pkgstats.service (rev 0) +++ pkgstats.service 2019-02-17 00:06:57 UTC (rev 346395) @@ -0,0 +1,9 @@ +[Unit] +Description=Submit pkgstats +After=network-online.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/pkgstats -q +User=nobody +Group=nobody Deleted: pkgstats.sh =================================================================== --- pkgstats.sh 2019-02-17 00:06:34 UTC (rev 346394) +++ pkgstats.sh 2019-02-17 00:06:57 UTC (rev 346395) @@ -1,79 +0,0 @@ -#!/bin/bash - -pkgstatsver='2.3' -showonly=false -quiet=false -option='-q -s -S -L' - -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://pkgstats.archlinux.de/' -} - -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)" -moduleslist="$(mktemp --tmpdir modules.XXXXXX)" -trap 'rm -f "${pkglist}" "${moduleslist}"' 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 - 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} \ - -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://pkgstats.archlinux.de/post' \ - || echo 'Sorry, data could not be sent.' >&2 -fi Copied: pkgstats/repos/extra-any/pkgstats.sh (from rev 346394, pkgstats/trunk/pkgstats.sh) =================================================================== --- pkgstats.sh (rev 0) +++ pkgstats.sh 2019-02-17 00:06:57 UTC (rev 346395) @@ -0,0 +1,79 @@ +#!/bin/bash + +pkgstatsver='2.3' +showonly=false +quiet=false +option='-q -s -S -L' + +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://pkgstats.archlinux.de/' +} + +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)" +moduleslist="$(mktemp --tmpdir modules.XXXXXX)" +trap 'rm -f "${pkglist}" "${moduleslist}"' 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 + 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} \ + -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://pkgstats.archlinux.de/post' \ + || echo 'Sorry, data could not be sent.' >&2 +fi Deleted: pkgstats.timer =================================================================== --- pkgstats.timer 2019-02-17 00:06:34 UTC (rev 346394) +++ pkgstats.timer 2019-02-17 00:06:57 UTC (rev 346395) @@ -1,10 +0,0 @@ -[Unit] -Description=Weekly pkgstats submission - -[Timer] -OnCalendar=weekly -AccuracySec=1d -Persistent=true - -[Install] -WantedBy=timers.target Copied: pkgstats/repos/extra-any/pkgstats.timer (from rev 346394, pkgstats/trunk/pkgstats.timer) =================================================================== --- pkgstats.timer (rev 0) +++ pkgstats.timer 2019-02-17 00:06:57 UTC (rev 346395) @@ -0,0 +1,7 @@ +[Unit] +Description=Weekly pkgstats submission + +[Timer] +OnCalendar=weekly +AccuracySec=1d +Persistent=true