version output improvement

4 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 747c77736daa..7e6f035afa4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-server
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.
 	pkgver = 5.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-server.install
 	arch = any
@@ -26,8 +26,8 @@ pkgbase = pi-hole-server
 	backup = etc/dnsmasq.conf
 	source = pi-hole-server-core-5.2.1.tar.gz::https://github.com/pi-hole/pi-hole/archive/v5.2.1.tar.gz
 	source = pi-hole-server-admin-5.2.1.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v5.2.1.tar.gz
-	source = arch-server-core-5.2.1-142018903.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-5.2.1.patch
-	source = arch-server-admin-5.2.1-142018903.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-5.2.1.patch
+	source = arch-server-core-5.2.1-977347754.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-5.2.1.patch
+	source = arch-server-admin-5.2.1-977347754.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-5.2.1.patch
 	source = dnsmasq.include
 	source = lighttpd.pi-hole.conf
 	source = nginx.pi-hole.conf
@@ -41,8 +41,8 @@ pkgbase = pi-hole-server
 	source = piholeDebug.sh
 	md5sums = 9440c4fa703da269f0c5f38119a7bbdd
 	md5sums = f9161cdcc3baa14925bb446f5f439002
-	md5sums = ea9b3a8bab46b698f3a6a516527e8512
-	md5sums = 6a9b00918ff626feeda4662bab211a06
+	md5sums = 466b7f3193bf962b15232eef32c4b458
+	md5sums = c681552c1411e8b100bd8686dc8109ae
 	md5sums = 62ab22d82267f30bd1a75773a1de79c8
 	md5sums = 971cc2859672341d77f8deba702fb7f7
 	md5sums = b63fcf29c29796023a2677bcf2b369a7
@@ -51,7 +51,7 @@ pkgbase = pi-hole-server
 	md5sums = d42a864f88299998f8233c0bc0dd093d
 	md5sums = 20c5b0c6b4e23e55b25ab6c28dda709d
 	md5sums = 291d3c95e445fe65caf40c3605efd186
-	md5sums = c227ffa88ddebc34cb715b73640cd845
+	md5sums = f3d97637e0e74599ae77e6ab36cb9e26
 	md5sums = c9a5fa5fe9b794b0630cb53fb343f598
 	md5sums = d7b69ae51db0e8ac8e27f20a234eed85
 
diff --git a/PKGBUILD b/PKGBUILD
index 88d503009936..1d25a1cfc2ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=pi-hole-server
 _pkgname=pi-hole
 pkgver=5.2.1
-pkgrel=1
+pkgrel=2
 _wwwpkgname=AdminLTE
 _wwwpkgver=5.2.1
 _now=`date +%N`
@@ -43,8 +43,8 @@ source=($pkgname-core-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/arc
 
 md5sums=('9440c4fa703da269f0c5f38119a7bbdd'
          'f9161cdcc3baa14925bb446f5f439002'
-         'ea9b3a8bab46b698f3a6a516527e8512'
-         '6a9b00918ff626feeda4662bab211a06'
+         '466b7f3193bf962b15232eef32c4b458'
+         'c681552c1411e8b100bd8686dc8109ae'
          '62ab22d82267f30bd1a75773a1de79c8'
          '971cc2859672341d77f8deba702fb7f7'
          'b63fcf29c29796023a2677bcf2b369a7'
@@ -53,7 +53,7 @@ md5sums=('9440c4fa703da269f0c5f38119a7bbdd'
          'd42a864f88299998f8233c0bc0dd093d'
          '20c5b0c6b4e23e55b25ab6c28dda709d'
          '291d3c95e445fe65caf40c3605efd186'
-         'c227ffa88ddebc34cb715b73640cd845'
+         'f3d97637e0e74599ae77e6ab36cb9e26'
          'c9a5fa5fe9b794b0630cb53fb343f598'
          'd7b69ae51db0e8ac8e27f20a234eed85')
 
diff --git a/mimic_setupVars.conf.sh b/mimic_setupVars.conf.sh
index 2c5ca75eb619..57e65bd8f5af 100644
--- a/mimic_setupVars.conf.sh
+++ b/mimic_setupVars.conf.sh
@@ -53,6 +53,7 @@ finalExports() {
     echo "PIHOLE_INTERFACE=${IPV4DEV}"
     echo "IPV4_ADDRESS=${IPV4_ADDRESS}"
     echo "IPV6_ADDRESS=${IPV6_ADDRESS}"
+    echo "INSTALL_WEB_INTERFACE=true"
     }>> "${setupVars}"
 }
 
diff --git a/pi-hole-server.install b/pi-hole-server.install
index 9b193e5b2ecf..80429414c0a6 100644
--- a/pi-hole-server.install
+++ b/pi-hole-server.install
@@ -31,6 +31,9 @@ post_upgrade() {
 
   # update owner of existing dir and file
   chown pihole:pihole /etc/pihole
+  
+  # pihoel version output improvement
+  grep -qxF 'INSTALL_WEB_INTERFACE=true' /etc/pihole/setupVars.conf || echo 'INSTALL_WEB_INTERFACE=true' >> /etc/pihole/setupVars.conf
 
   # warning
   cache_problem