Update to 4.2.2

3 files changed, 45 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2779f78eff1..df47afcace59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = adminer-editor
 	pkgdesc = Database data editing tool written in PHP
-	pkgver = 4.2.1
+	pkgver = 4.2.2
 	pkgrel = 1
 	url = http://www.adminer.org/en/editor/
 	install = adminer-editor.install
@@ -12,8 +12,8 @@ pkgbase = adminer-editor
 	optdepends = postgresql
 	optdepends = sqlite
 	optdepends = sqlite2
-	source = http://downloads.sourceforge.net/adminer/editor-4.2.1.php
-	md5sums = 4bad913d9a3d2d665692d2e32a190d2e
+	source = http://downloads.sourceforge.net/adminer/editor-4.2.2.php
+	sha256sums = 3b07a61595756703a3e443a2bae082ae7acca511940cdaf3976cb33c7b477705
 
 pkgname = adminer-editor
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a14d79ee320..8b7070d2536c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,43 @@
-# Maintainer: Sabart Otto - Seberm <seberm[at]gmail[dot]com>
+# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com
+# Contributor: Sabart Otto - Seberm <seberm[at]gmail[dot]com>
 
-pkgname=adminer-editor
-pkgver=4.2.1
-pkgrel=1
-pkgdesc="Database data editing tool written in PHP"
+set -u
+pkgname='adminer-editor'
+pkgver='4.2.2'
+pkgrel='1'
+pkgdesc='Database data editing tool written in PHP'
 arch=('any')
 license=('Apache License, Version 2.0')
 depends=('php')
-conflicts=('')
+#conflicts=('')
 optdepends=('mariadb' 'apache' 'postgresql' 'sqlite' 'sqlite2')
-url="http://www.adminer.org/en/editor/"
-install=adminer-editor.install
+url='http://www.adminer.org/en/editor/'
+_verurl="${url}"
+_versed='http://downloads.sourceforge.net/adminer/editor-\([0-9\.]\+\).php'
+_veropt='l'
+install="${pkgname}.install"
 source=("http://downloads.sourceforge.net/adminer/editor-${pkgver}.php")
+sha256sums=('3b07a61595756703a3e443a2bae082ae7acca511940cdaf3976cb33c7b477705')
 
 package() {
-  _instdir=$pkgdir/usr/share/webapps/$pkgname
-  mkdir -p ${_instdir} $pkgdir/etc/webapps/$pkgname $pkgdir/etc/httpd/conf/extra
+  set -u
 
-  install -D -m644 $srcdir/editor-${pkgver}.php $_instdir/index.php
+  install -Dpm644 "${srcdir}/editor-${pkgver}.php" "${pkgdir}/usr/share/webapps/${pkgname}/index.php"
 
   # It's similar to phpMyAdmin
-  cat >$pkgdir/etc/webapps/$pkgname/apache.example.conf <<EOF
-	Alias /${pkgname} "/usr/share/webapps/${pkgname}"
-	<Directory "/usr/share/webapps/${pkgname}">
-		AllowOverride All
-		Options FollowSymlinks
-        Require all granted
-        php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
-	</Directory>
+  install -Dpm644 <(cat << EOF
+Alias /${pkgname} "/usr/share/webapps/${pkgname}"
+<Directory "/usr/share/webapps/${pkgname}">
+  AllowOverride All
+  Options FollowSymlinks
+    Require all granted
+    php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
+</Directory>
 EOF
+) "${pkgdir}/etc/webapps/${pkgname}/apache.example.conf"
 
-  cp $pkgdir/etc/webapps/$pkgname/apache.example.conf $pkgdir/etc/httpd/conf/extra/httpd-${pkgname}.conf
-#  echo "Include conf/extra/httpd-${pkgname}.conf" >> $pkgdir/etc/httpd/conf/httpd.conf
-
+  install -Dpm644 "${pkgdir}/etc/webapps/${pkgname}/apache.example.conf" "${pkgdir}/etc/httpd/conf/extra/httpd-${pkgname}.conf"
+  #echo "Include conf/extra/httpd-${pkgname}.conf" >> ${pkgdir}/etc/httpd/conf/httpd.conf
+  set +u
 }
-
-md5sums=('4bad913d9a3d2d665692d2e32a190d2e')
+set +u
diff --git a/adminer-editor.install b/adminer-editor.install
index 3c20cb517c85..35cbca8059e9 100644
--- a/adminer-editor.install
+++ b/adminer-editor.install
@@ -1,4 +1,6 @@
-TEXT='
+post_install() {
+  if ! grep '^Include conf/extra/httpd-adminer-editor.conf$' '/etc/httpd/conf/httpd.conf'; then
+    TEXT='
 If you want to access adminer interface by your apache server, run following command as root:\n
 echo "Include conf/extra/httpd-adminer-editor.conf" >> /etc/httpd/conf/httpd.conf\n\n
 
@@ -6,12 +8,17 @@ And restart your apache running "rc.d restart httpd"\n
 Or (if you are using systemd) "systemctl restart httpd"\n\n
 
 After you can browse adminer editor on http://localhost/adminer-editor\n';
-
-
-post_install() {
-	echo -e $TEXT;
+    echo -e $TEXT
+  fi
 }
 
 post_upgrade() {
-	echo -e $TEXT;
+  post_install
+}
+
+post_remove() {
+  if grep '^Include conf/extra/httpd-adminer-editor.conf$' '/etc/httpd/conf/httpd.conf'; then
+    echo 'To completely remove Adminer Editor, remove its include from /etc/httpd/conf/httpd.conf'
+    echo 'and restart your httpd server'
+  fi
 }