diff options
| author | max.bra | 2016-04-13 08:52:59 +0200 |
|---|---|---|
| committer | max.bra | 2016-04-13 08:52:59 +0200 |
| commit | a3c93f5aa39cacab5978ba481f74d32cce0c2e3b (patch) | |
| tree | f16a1822f6fc3410ef0e0bdafef414b8bc52e24d /PKGBUILD | |
| parent | 040a83c04e04a95a85adda5d9e07b3d84defa87b (diff) | |
| download | aur-a3c93f5aa39cacab5978ba481f74d32cce0c2e3b.tar.gz | |
gravity.sh: debian only cmd removed, better service handling
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -3,7 +3,7 @@ pkgname=pi-hole-server _pkgname=pi-hole pkgver=2.6.2 -pkgrel=1 +pkgrel=2 _wwwpkgname=AdminLTE _wwwpkgver=1.1.7 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' @@ -45,9 +45,17 @@ md5sums=('f899e540c76224575d15ed7af928703e' prepare() { _ssc="/tmp/sedcontrol" + # undebianizing + sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: undebianizing" && return 1 ; fi + # modify service management - sed -i "s|^ \$SUDO service dnsmasq start| $SUDO systemctl start dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management" && return 1 ; fi + sed -i 's|\[\[ \$dnsmasqPid \]\]|systemctl is-active dnsmasq 2\>\&1 \>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 1" && return 1 ; fi + sed -i "s|\$SUDO kill -HUP \"\$dnsmasqPid\"|\$SUDO systemctl reload dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 2" && return 1 ; fi + sed -i "s|\$SUDO service dnsmasq start|\$SUDO systemctl start dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 3" && return 1 ; fi # gravity call paths changing sed -i "s|/opt/pihole/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh @@ -60,14 +68,14 @@ prepare() { # useless by definition sed -n "/# Reload hosts file/w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: useless by definition" && return 1 ; fi - sed -i '/# Reload hosts file/,+8d' "$srcdir"/$_pkgname-$pkgver/gravity.sh + sed -i '/# Reload hosts file/,+9d' "$srcdir"/$_pkgname-$pkgver/gravity.sh # change log location in admin php interface and scripts sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface and scripts" && return 1 ; fi # original toilet is in aur, enter figlet - sed -i "s| toilet -f small -F gay Pi-hole| figlet Pi-hole|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh + sed -i "s|toilet -f small -F gay Pi-hole|figlet Pi-hole|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: original toilet is in aur, enter figlet" && return 1 ; fi # little arch changes to chronometer.sh |