From 544914b0f3047f502a053093aa41f7cd0d16837a Mon Sep 17 00:00:00 2001 From: Techlive Zheng Date: Thu, 27 Dec 2012 22:19:02 +0800 Subject: [PATCH 1/5] Clean up, expand tab to spaces --- modif/munin/PKGBUILD | 58 +++++++++++++++++++++--------------------- modif/munin/munin-node.init | 2 +- modif/munin/munin-node.install | 2 +- modif/munin/munin.install | 6 ++--- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/modif/munin/PKGBUILD b/modif/munin/PKGBUILD index e3016f3..e95ea38 100644 --- a/modif/munin/PKGBUILD +++ b/modif/munin/PKGBUILD @@ -26,52 +26,52 @@ source=(http://downloads.sourceforge.net/sourceforge/munin/munin-$pkgver.tar.gz munin-html.{service,socket} 08-munin-font-dir.conf) -build() { - cd "$srcdir/munin-$pkgver" +build() { + cd "$srcdir/munin-$pkgver" - sed -i -e 's#/sbin/ip6tables#/usr/sbin/ip6tables#' plugins/node.d.linux/ip_.in + sed -i -e 's#/sbin/ip6tables#/usr/sbin/ip6tables#' plugins/node.d.linux/ip_.in - cp ../Makefile.config . - # multithreading wrecks havoc on the build, should probably report this - make -j1 PREFIX='' + cp ../Makefile.config . + # multithreading wrecks havoc on the build, should probably report this + make -j1 PREFIX='' } package_munin() { - depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip' + depends=('perl' 'rrdtool' 'perl-html-template' 'perl-date-manip' 'perl-log-log4perl' 'perl-io-socket-inet6' 'perl-file-copy-recursive' 'perl-fcgi' 'perl-uri' 'munin-node') - backup=(etc/munin/munin.conf etc/logrotate.d/munin) - install=munin.install + backup=(etc/munin/munin.conf etc/logrotate.d/munin) + install=munin.install - cd "$srcdir/munin-$pkgver" - make DESTDIR="$pkgdir" install-master-prime - install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry - install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin - install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin.conf + cd "$srcdir/munin-$pkgver" + make DESTDIR="$pkgdir" install-master-prime + install -D -m644 ../munin-cron-entry "$pkgdir"/etc/munin/munin-cron-entry + install -D -m644 ../logrotate.munin "$pkgdir"/etc/logrotate.d/munin + install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin.conf install -D -m644 ../munin-graph.service "$pkgdir"/usr/lib/systemd/system/munin-graph.service install -D -m644 ../munin-graph.socket "$pkgdir"/usr/lib/systemd/system/munin-graph.socket install -D -m644 ../munin-html.service "$pkgdir"/usr/lib/systemd/system/munin-html.service install -D -m644 ../munin-html.socket "$pkgdir"/usr/lib/systemd/system/munin-html.socket - install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf - rm -rf "$pkgdir/run" + install -D -m644 ../08-munin-font-dir.conf "$pkgdir"/etc/fonts/conf.d/08-munin-font-dir.conf + rm -rf "$pkgdir/run" } package_munin-node() { - depends=('perl' 'perl-net-server') - optdepends=('perl-net-snmp: for SNMP plugins' - 'perl-net-ssleay: for SSL/TLS support' - 'python2: for some plugins' - 'ruby: for some plugins') - backup=(etc/munin/munin-node.conf etc/logrotate.d/munin-node) - install=munin-node.install + depends=('perl' 'perl-net-server') + optdepends=('perl-net-snmp: for SNMP plugins' + 'perl-net-ssleay: for SSL/TLS support' + 'python2: for some plugins' + 'ruby: for some plugins') + backup=(etc/munin/munin-node.conf etc/logrotate.d/munin-node) + install=munin-node.install - cd "$srcdir/munin-$pkgver" - make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime - install -D -m755 ../munin-node.init "$pkgdir"/etc/rc.d/munin-node - install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node - install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf + cd "$srcdir/munin-$pkgver" + make DESTDIR="$pkgdir" install-common-prime install-node-prime install-plugins-prime + install -D -m755 ../munin-node.init "$pkgdir"/etc/rc.d/munin-node + install -D -m644 ../logrotate.munin-node "$pkgdir"/etc/logrotate.d/munin-node + install -D -m644 ../munin.tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/munin-node.conf install -D -m644 ../munin-node.service "$pkgdir"/usr/lib/systemd/system/munin-node.service - rm -rf "$pkgdir/run/" + rm -rf "$pkgdir/run/" } md5sums=('bcec945e070d09f2b7deb82dee347e0e' diff --git a/modif/munin/munin-node.init b/modif/munin/munin-node.init index 39bc95b..e38cb08 100755 --- a/modif/munin/munin-node.init +++ b/modif/munin/munin-node.init @@ -10,7 +10,7 @@ PATH='/bin:/usr/bin:/sbin:/usr/sbin' case "$1" in start) stat_busy "Starting munin-node" - [ -d /var/run/munin ] || mkdir -p /var/run/munin + [ -d /var/run/munin ] || mkdir -p /var/run/munin munin-node >/dev/null stat_done add_daemon munin-node diff --git a/modif/munin/munin-node.install b/modif/munin/munin-node.install index df92f49..ad1ef22 100644 --- a/modif/munin/munin-node.install +++ b/modif/munin/munin-node.install @@ -2,7 +2,7 @@ post_install () { # Check user/group munin exists getent group munin >/dev/null || groupadd --system munin getent passwd munin >/dev/null || \ - useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin + useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin # Do basic configuration echo "==> Run the following to get a good set of default plugins:" echo " munin-node-configure --shell | sh" diff --git a/modif/munin/munin.install b/modif/munin/munin.install index 99eba56..954fb79 100644 --- a/modif/munin/munin.install +++ b/modif/munin/munin.install @@ -2,10 +2,10 @@ post_install () { # Check user/group munin exists getent group munin >/dev/null || groupadd --system munin getent passwd munin >/dev/null || \ - useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin + useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin # Display cron command - echo "See the example cron entry (for the munin user) for further setup: - /etc/munin/munin-cron-entry" + echo "==> See the example cron entry (for the munin user) for further setup:" + echo " /etc/munin/munin-cron-entry" post_upgrade } -- 1.8.0.2