v. 3.2

4 files changed, 24 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b45de02da87d..9ce26ccd270a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-standalone
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.
-	pkgver = 3.1.4
-	pkgrel = 5
+	pkgver = 3.2
+	pkgrel = 1
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-standalone.install
 	arch = any
@@ -13,18 +13,18 @@ pkgbase = pi-hole-standalone
 	backup = etc/pihole/whitelist.txt
 	backup = etc/pihole/blacklist.txt
 	backup = etc/dnsmasq.d/01-pihole.conf
-	source = https://github.com/pi-hole/pi-hole/archive/v3.1.4.tar.gz
+	source = https://github.com/pi-hole/pi-hole/archive/v3.2.tar.gz
 	source = dnsmasq.main
 	source = dnsmasq.include
 	source = pi-hole-gravity.service
 	source = pi-hole-gravity.timer
 	source = mimic_setupVars.conf.sh
-	md5sums = e231722332116b7ffab316d5c66a828e
+	md5sums = 12b29c41a1e8e2892da2684fea566ebb
 	md5sums = b955136ef15be29a468e8d9f85f24b8c
 	md5sums = 0bab89977a2d4357ec8befb4ff85ee3d
 	md5sums = 047f13d4ac97877f724f87b002aaee63
 	md5sums = d42a864f88299998f8233c0bc0dd093d
-	md5sums = d01db2332f2d1039dbecf91b69f93dc9
+	md5sums = 7821b6dfe380955073701e5acd1587a2
 
 pkgname = pi-hole-standalone
 
diff --git a/PKGBUILD b/PKGBUILD
index 9785de3f56c7..ff2822a4d372 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=pi-hole-standalone
 _pkgname=pi-hole
-pkgver=3.1.4
-pkgrel=5
+pkgver=3.2
+pkgrel=1
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.'
 arch=('any')
 license=('EUPL-1.1')
@@ -21,15 +21,19 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	$_pkgname-gravity.timer
 	mimic_setupVars.conf.sh)
 
-md5sums=('e231722332116b7ffab316d5c66a828e'
+md5sums=('12b29c41a1e8e2892da2684fea566ebb'
          'b955136ef15be29a468e8d9f85f24b8c'
          '0bab89977a2d4357ec8befb4ff85ee3d'
          '047f13d4ac97877f724f87b002aaee63'
          'd42a864f88299998f8233c0bc0dd093d'
-         'd01db2332f2d1039dbecf91b69f93dc9')
+         '7821b6dfe380955073701e5acd1587a2')
 
 prepare() {
   _ssc="/tmp/sedcontrol"
+  
+  # the return of service management
+  sed -i "s|service dnsmasq \${svcOption}|systemctl \${svcOption} dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: the return of service management" && return 1 ; fi
 
   # setting up and securing pihole wrapper script
   sed -n "/debugFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
@@ -90,16 +94,11 @@ prepare() {
 # -----------------
 
   # setup gravity.sh
-  sed -n "/#ensure \/etc\/dnsmasq\.d\//w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
+  sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setup gravity.sh 1" && return 1 ; fi
-  sed -i '/#ensure \/etc\/dnsmasq\.d\//,+5d' "$srcdir"/$_pkgname-$pkgver/gravity.sh
-#  sed -n "/#Overwrite /w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
-#  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setup gravity.sh 2" && return 1 ; fi
-#  sed -i '/#Overwrite /,+1d' "$srcdir"/$_pkgname-$pkgver/gravity.sh
-  sed -i "s|/usr/local/bin/pihole|/usr/bin/pihole|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
+  sed -i "s|/etc/\.|/etc/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setup gravity.sh 2" && return 1 ; fi
-  sed -i "s|/etc/.pihole|/etc/pihole|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
-  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setup gravity.sh 3" && return 1 ; fi
+
 
 # -----------------
 
diff --git a/mimic_setupVars.conf.sh b/mimic_setupVars.conf.sh
index 2c0a4b346600..d163d46cb340 100644
--- a/mimic_setupVars.conf.sh
+++ b/mimic_setupVars.conf.sh
@@ -15,7 +15,7 @@ getIPv6stuff()
 {
 	if [ -e /proc/net/if_inet6 ]; then
 		# change local ip to unusable 0.0.0.0 (ref. http://dlaa.me/blog/post/skyhole), and :: for ipv6
-		IPv6_ADDRESS="::"
+		IPV6_ADDRESS="::"
 	fi
 }
 
@@ -28,7 +28,7 @@ finalExports() {
     {
     echo "PIHOLE_INTERFACE=${IPV4DEV}"
     echo "IPV4_ADDRESS=${IPV4_ADDRESS}"
-    echo "IPV6_ADDRESS=${IPv6_ADDRESS}"
+    echo "IPV6_ADDRESS=${IPV6_ADDRESS}"
     }>> "${setupVars}"
 }
 
diff --git a/pi-hole-standalone.install b/pi-hole-standalone.install
index 1ec785a107b3..65d05c4831f4 100644
--- a/pi-hole-standalone.install
+++ b/pi-hole-standalone.install
@@ -1,3 +1,7 @@
+warning() {
+  /usr/bin/true  
+}
+
 post_install() {
   echo -e "\e[1;33m==>\e[0m Read setup instructions at \e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m"
   echo -e "\e[1;33m==>\e[0m Generating initial block list, please wait...\e[0m"
@@ -17,6 +21,8 @@ post_upgrade() {
   [ -e /etc/pihole/hosts ] && rm /etc/pihole/hosts
   [ -e /etc/pihole/.useIPv6 ] && rm /etc/pihole/.useIPv6
 
+  warning
+
   # keep pacman from throwing errors should none them be on the filesystem
   return 0
 }