Index: PKGBUILD
===================================================================
diff --git a/uwsgi/trunk/PKGBUILD b/uwsgi/trunk/PKGBUILD
--- a/uwsgi/trunk/PKGBUILD	(revision 94862)
+++ b/uwsgi/trunk/PKGBUILD	(working copy)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
-# Contributor: Angel Velasquez <angvp@archlinux.org>  
+# Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Kevin Zuber <uKev@knet.eu>
 # Contributor: Vsevolod Balashov <vsevolod@balashov.name>
 
@@ -25,7 +25,7 @@
         uwsgi-plugin-zergpool
         )
 pkgver=1.9.14
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
 license=(GPL2)
@@ -42,191 +42,205 @@
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch)
 
-prepare(){
-    cd $srcdir/$pkgbase-$pkgver
-    cp $srcdir/archlinux.ini buildconf/archlinux.ini
+prepare() {
+    cd "$srcdir/$pkgbase-$pkgver"
+    cp "$srcdir/archlinux.ini" buildconf/archlinux.ini
     sed -i 's/LIBS .*-lphp5.*/LIBS = []/' plugins/php/uwsgiplugin.py
     for patch in uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do
-        patch -Np1 -i $srcdir/$patch
+        patch -Np1 -i "$srcdir/$patch"
     done
     rm -rf plugins/ruby
     mv plugins/ruby{19,}
-    cp -a plugins/python{,2}
     sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py
+}
 
-}
 build() {
-  pushd $srcdir/$pkgbase-$pkgver
+  cd "$srcdir/$pkgbase-$pkgver"
   python uwsgiconfig.py --build archlinux.ini
+
+  python2 uwsgiconfig.py --plugin plugins/python archlinux python2
+  python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet
 }
 
 package_uwsgi() {
-  backup=(etc/uwsgi/archlinux.ini)
   pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"
-  depends=(python2 libxml2 jansson libyaml systemd) 
+  depends=(python2 libxml2 jansson libyaml systemd)
   install=uwsgi.install
-  cd $srcdir/$pkgbase-$pkgver
-  install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi
-  install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini
-  install -Dm644 $srcdir/uwsgi@.service $pkgdir/usr/lib/systemd/system/uwsgi@.service
-  install -Dm644 $srcdir/uwsgi@.socket $pkgdir/usr/lib/systemd/system/uwsgi@.socket
-  install -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so
-  install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini
-  install -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf
+
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  install -Dm755 uwsgi "$pkgdir/usr/bin/uwsgi"
+  install -Dm755 systemd_logger_plugin.so "$pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so"
+  install -Dm644 "$srcdir/uwsgi@.service" "$pkgdir/usr/lib/systemd/system/uwsgi@.service"
+  install -Dm644 "$srcdir/uwsgi@.socket" "$pkgdir/usr/lib/systemd/system/uwsgi@.socket"
+  install -Dm644 "$srcdir/tmpfilesd" "$pkgdir/usr/lib/tmpfiles.d/uwsgi.conf"
 }
 
-package_uwsgi-plugin-common(){
+package_uwsgi-plugin-common() {
     depends=(uwsgi)
     pkgdesc="Common plugins for uWSGI"
-    install -dm755 $pkgdir/usr/bin
+
+    install -dm755 "$pkgdir/usr/bin"
+
     for plugin in cache cgi rpc ugreen; do
-        ln -s uwsgi $pkgdir/usr/bin/uwsgi_${plugin}
-        install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so
+        ln -s uwsgi "$pkgdir/usr/bin/uwsgi_${plugin}"
+        install -Dm755 "$pkgbase-$pkgver/${plugin}_plugin.so" "$pkgdir/usr/lib/uwsgi/${plugin}_plugin.so"
     done
 }
 
-package_uwsgi-plugin-rack(){
+package_uwsgi-plugin-rack() {
     depends=(ruby uwsgi-plugin-common)
-    pkgdesc="Ruby rack plugin"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_rack
-    install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so
+    pkgdesc="Plugin for Rack support"
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_rack"
+    install -Dm755 "$pkgbase-$pkgver/rack_plugin.so" "$pkgdir/usr/lib/uwsgi/rack_plugin.so"
 }
 
-package_uwsgi-plugin-python2(){
+package_uwsgi-plugin-python2() {
     depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Python2 support"
-    cd $srcdir/$pkgbase-$pkgver
-    python2 uwsgiconfig.py --plugin plugins/python archlinux python
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2
-    install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_python2"
+    install -Dm755 "$srcdir/$pkgbase-$pkgver/python2_plugin.so" "$pkgdir/usr/lib/uwsgi/python2_plugin.so"
 }
 
-package_uwsgi-plugin-python(){
+package_uwsgi-plugin-python() {
     depends=(python uwsgi-plugin-common)
     pkgdesc="Plugin for Python support"
-    install -dm755 $pkgdir/usr/bin
-    cd $srcdir/$pkgbase-$pkgver
-    python3 uwsgiconfig.py --plugin plugins/python archlinux python
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_python
-    install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_python"
+    install -Dm755 "$srcdir/$pkgbase-$pkgver/python_plugin.so" "$pkgdir/usr/lib/uwsgi/python_plugin.so"
 }
 
-package_uwsgi-plugin-nagios(){
-    depends=( uwsgi-plugin-common)
+package_uwsgi-plugin-nagios() {
+    depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Nagios support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_nagios
-    install -Dm755 $pkgbase-$pkgver/nagios_plugin.so $pkgdir/usr/lib/uwsgi/nagios_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_nagios"
+    install -Dm755 "$pkgbase-$pkgver/nagios_plugin.so" "$pkgdir/usr/lib/uwsgi/nagios_plugin.so"
 }
 
-package_uwsgi-plugin-router(){
-    depends=( uwsgi-plugin-common)
+package_uwsgi-plugin-router() {
+    depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Router support"
-    install -dm755 $pkgdir/usr/lib/uwsgi
-    install -dm755 $pkgdir/usr/bin
-    cd $pkgbase-$pkgver
+
+    install -dm755 "$pkgdir/usr/lib/uwsgi"
+    install -dm755 "$pkgdir/usr/bin"
+
+    cd "$srcdir/$pkgbase-$pkgver"
+
     for file in *router*_plugin.so; do
-        install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file
-        ln -s uwsgi $pkgdir/usr/bin/uwsgi_${file%_plugin.so}
+        install -Dm755 "$file" "$pkgdir/usr/lib/uwsgi/$file"
+        ln -s uwsgi "$pkgdir/usr/bin/uwsgi_${file%_plugin.so}"
     done
 }
 
-package_uwsgi-plugin-admin(){
-    depends=( uwsgi-plugin-common)
+package_uwsgi-plugin-admin() {
+    depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Admin support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_admin
-    install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_admin"
+    install -Dm755 "$pkgbase-$pkgver/admin_plugin.so" "$pkgdir/usr/lib/uwsgi/admin_plugin.so"
 }
 
-package_uwsgi-plugin-ruby(){
+package_uwsgi-plugin-ruby() {
     depends=(ruby uwsgi-plugin-common)
     pkgdesc="Plugin for Ruby support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_ruby
-    install -Dm755 $pkgbase-$pkgver/ruby_plugin.so $pkgdir/usr/lib/uwsgi/ruby_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_ruby"
+    install -Dm755 "$pkgbase-$pkgver/ruby_plugin.so" "$pkgdir/usr/lib/uwsgi/ruby_plugin.so"
 }
 
 
-package_uswgi-plugin-lua51(){
+package_uswgi-plugin-lua51() {
     depends=(lua uwsgi-plugin-common)
     pkgdesc="Plugin for Lua support"
-    install -dm755 $pkgdir/usr/bin
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua51
-    install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua51_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_lua51"
+    install -Dm755 "$pkgbase-$pkgver/lua_plugin.so" "$pkgdir/usr/lib/uwsgi/lua51_plugin.so"
 }
 
-package_uswgi-plugin-greenlet(){
+package_uswgi-plugin-greenlet() {
     depends=(python2-greenlet uwsgi-plugin-common)
     pkgdesc="Plugin for Python Greenlet support"
-    cd $srcdir/$pkgbase-$pkgver
-    python2 uwsgiconfig.py --plugin plugins/greenlet archlinux.ini greenlet
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet
-    install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_greenlet"
+    install -Dm755 "$pkgbase-$pkgver/greenlet_plugin.so" "$pkgdir/usr/lib/uwsgi/greenlet_plugin.so"
 }
 
 package_uswgi-plugin-php(){
     depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for PHP support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_php
-    install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_php"
+    install -Dm755 "$pkgbase-$pkgver/php_plugin.so" "$pkgdir/usr/lib/uwsgi/php_plugin.so"
 }
 
 package_uwsgi-plugin-carbon(){
     depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Carbon support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_carbon
-    install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_carbon"
+    install -Dm755 "$pkgbase-$pkgver/carbon_plugin.so" "$pkgdir/usr/lib/uwsgi/carbon_plugin.so"
 }
 
 package_uwsgi-plugin-rrdtool(){
     depends=(uwsgi-plugin-common rrdtool)
     pkgdesc="Plugin for Rrdtool support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_rrdtool
-    install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_rrdtool"
+    install -Dm755 "$pkgbase-$pkgver/rrdtool_plugin.so" "$pkgdir/usr/lib/uwsgi/rrdtool_plugin.so"
 }
 
 package_uwsgi-plugin-erlang(){
     depends=(uwsgi-plugin-common erlang)
     pkgdesc="Plugin for Erlang support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_erlang
-    install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_erlang"
+    install -Dm755 "$pkgbase-$pkgver/erlang_plugin.so" "$pkgdir/usr/lib/uwsgi/erlang_plugin.so"
 }
 
-
 package_uwsgi-plugin-pam(){
     depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Pam support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_pam
-    install -Dm755 $pkgbase-$pkgver/pam_plugin.so $pkgdir/usr/lib/uwsgi/pam_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_pam"
+    install -Dm755 "$pkgbase-$pkgver/pam_plugin.so" "$pkgdir/usr/lib/uwsgi/pam_plugin.so"
 }
 
 package_uwsgi-plugin-jvm(){
     depends=(uwsgi-plugin-common java-runtime=7)
     pkgdesc="Plugin for Jvm support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_jvm
-    install -Dm755 $pkgbase-$pkgver/jvm_plugin.so $pkgdir/usr/lib/uwsgi/jvm_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_jvm"
+    install -Dm755 "$pkgbase-$pkgver/jvm_plugin.so" "$pkgdir/usr/lib/uwsgi/jvm_plugin.so"
 }
 
 package_uwsgi-plugin-zergpool(){
     depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for zergpool support"
-    install -dm755 $pkgdir/usr/bin
-    ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool
-    install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so
+
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s uwsgi "$pkgdir/usr/bin/uwsgi_zergpool"
+    install -Dm755 "$pkgbase-$pkgver/zergpool_plugin.so" "$pkgdir/usr/lib/uwsgi/zergpool_plugin.so"
 }
+
 md5sums=('ec9cf333534604f17ef4e24051d9d65d'
-         '1816524eb13705c20f6abc00557f4ea9'
+         '73a3ad84736c8f2f3d077c43b24cf1b7'
          'b05ba1d796e1ea608a40635bc4f3ec67'
          '0b79320fbae92715c96086cf51e60bc8'
          'db70315bbc8cb886a278ba59d5fd8d57'
Index: archlinux.ini
===================================================================
diff --git a/uwsgi/trunk/archlinux.ini b/uwsgi/trunk/archlinux.ini
--- a/uwsgi/trunk/archlinux.ini	(revision 94862)
+++ b/uwsgi/trunk/archlinux.ini	(working copy)
@@ -14,4 +14,4 @@
 malloc_implementation = libc
 embedded_plugins = echo, ping, corerouter, http
 plugin_dir = /usr/lib/uwsgi
-plugins = rack, python2, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger
+plugins = rack, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger
Index: uwsgi.install
===================================================================
diff --git a/uwsgi/trunk/uwsgi.install b/uwsgi/trunk/uwsgi.install
--- a/uwsgi/trunk/uwsgi.install	(revision 94862)
+++ b/uwsgi/trunk/uwsgi.install	(working copy)
@@ -1,7 +1,8 @@
-post_install(){
+post_install() {
     systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf
 }
-post_update(){
+
+post_update() {
     echo "To use uwsgi@.socket and uwsgi@.service:"
     echo "\tAll you need to do is put the name of your .ini file after the @ sign"
     echo "\tYou can use either the .socket or .service, but if you use the .socket"
@@ -9,3 +10,4 @@
     echo "\tserver touches the socket. You will also not need to specify the socket in"
     echo "\tthe .ini file or in the .service file.  Systemd will handle listening to"
     echo "\tthe socket for you."
+}