Updated to v0.13.2, but still an issue with plugn

4 files changed, 90 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6aa6ad5189a6..6a5ac056b6d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
 pkgbase = dokku
 	pkgdesc = Docker powered mini-Heroku in around 100 lines of Bash.
-	pkgver = 0.12.13
+	pkgver = 0.13.2
 	pkgrel = 1
 	url = https://github.com/dokku/dokku
 	install = dokku.install
 	arch = any
 	license = MIT
-	makedepends = go
-	makedepends = plugn
 	depends = bind-tools
 	depends = docker
 	depends = gliderlabs-sigil
-	depends = go
-	depends = herokuish>=0.4.4
-	depends = lsb-release
+	depends = herokuish
+	depends = net-tools
 	depends = nginx
-	depends = openbsd-netcat
-	depends = plugn>=0.3.0
-	depends = python
-	depends = sshcommand>=0.7.0
-	source = https://github.com/dokku/dokku/archive/v0.12.13.zip
+	depends = plugn
+	depends = rsyslog
+	depends = sshcommand
+	source = https://github.com/dokku/dokku/archive/v0.13.2.zip
 	source = dokku.install
-	sha256sums = 2ebb883f207da87eaf34e70a4051d42657fab79e8bcbff64bb4b3daa00403658
-	sha256sums = d8df381f8c9c170e2e446bed20beb6442dd2058ba8f0e9c5e234d31d86b2c9bc
+	sha256sums = e102ab0934d6675e6c31d2478ff3650ac949231e728512e672c71f663514e54c
+	sha256sums = 65175269313c2afcabec038d3994d940b7e60db91be270da11bfefc3febb9452
 
 pkgname = dokku
 
diff --git a/.gitignore b/.gitignore
index aed68513f742..5c239adc08ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,6 @@
-*.sw[po]
-*.tar
-*.tar.*
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-
-# AUR metadata
-.AURINFO
-#.SRCINFO
-
-pkg/
 src/
-dokku/
+pkg/
+dokku
+*.tar.xz
+*.tgz
+*.zip
diff --git a/PKGBUILD b/PKGBUILD
index 528850060920..453e214550db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,52 @@
 pkgname=dokku
-pkgver=0.12.13
+pkgver=0.13.2
 pkgrel=1
 pkgdesc="Docker powered mini-Heroku in around 100 lines of Bash."
 arch=(any)
 url="https://github.com/dokku/dokku"
 license=(MIT)
-makedepends=(
-  'go'
-  'plugn'
-)
 depends=(
   'bind-tools'
   'docker'
   'gliderlabs-sigil'
-  'go'
-  'herokuish>=0.4.4'
-  'lsb-release'
+  'herokuish'
+  'net-tools'
   'nginx'
-  'openbsd-netcat'
-  'plugn>=0.3.0'
-  'python'
-  'sshcommand>=0.7.0'
+  'plugn'
+  'rsyslog'
+  'sshcommand'
 )
 source=(
-  "https://github.com/dokku/dokku/archive/v${pkgver}.zip"
-  "${pkgname}.install"
+  "https://github.com/dokku/dokku/archive/v$pkgver.zip"
+  "$pkgname.install"
 )
-sha256sums=('2ebb883f207da87eaf34e70a4051d42657fab79e8bcbff64bb4b3daa00403658'
-            'd8df381f8c9c170e2e446bed20beb6442dd2058ba8f0e9c5e234d31d86b2c9bc')
-install=${pkgname}.install
+sha256sums=('e102ab0934d6675e6c31d2478ff3650ac949231e728512e672c71f663514e54c'
+            '65175269313c2afcabec038d3994d940b7e60db91be270da11bfefc3febb9452')
+install="$pkgname.install"
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Install executable
+  install -Dm755 dokku "$pkgdir/usr/bin/dokku"
+
+  # Build go plugins
+  make go-build
+
+  # Move all files in place
+  mkdir -p "$pkgdir/var/lib/dokku/core-plugins/available"
+  cp -r plugins/* "$pkgdir/var/lib/dokku/core-plugins/available"
+  cp common.mk "$pkgdir/var/lib/dokku/core-plugins/common.mk"
+
+  find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do
+    # Clean plugins
+    cd "$pkgdir/var/lib/dokku/core-plugins/available/$plugin"
+    if [ -e Makefile ]; then make src-clean ;fi
 
-  install -Dm755 dokku "${pkgdir}/usr/bin/dokku"
+    touch "$pkgdir/var/lib/dokku/core-plugins/available/$plugin/.core"
+  done
+  rm "$pkgdir/var/lib/dokku/core-plugins/common.mk"
 
-  go get github.com/ryanuber/columnize
-  go get github.com/dokku/dokku/plugins/config
-  env PLUGIN_MAKE_TARGET=build make go-build
-  mkdir -p "${pkgdir}/var/lib/dokku/core-plugins/available"
-  cp common.mk "${pkgdir}/var/lib/dokku/core-plugins/common.mk"
-  cp -r plugins/* "${pkgdir}/var/lib/dokku/core-plugins/available"
-  find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd "${pkgdir}/var/lib/dokku/core-plugins/available/${plugin}" && if [ -e Makefile ]; then make src-clean; fi; done
-  find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch "${pkgdir}/var/lib/dokku/core-plugins/available/${plugin}/.core"; done
-  rm "${pkgdir}/var/lib/dokku/core-plugins/common.mk"
-  echo "${pkgver}" > "${pkgdir}/var/lib/dokku/STABLE_VERSION"
+  # Version
+  echo $pkgver > "$pkgdir/var/lib/dokku/VERSION"
 }
diff --git a/dokku.install b/dokku.install
index f29898624fbe..d55f67c1c2a4 100644
--- a/dokku.install
+++ b/dokku.install
@@ -3,61 +3,71 @@ post_install() {
   DOKKU_ROOT="/home/dokku"
   DOKKU_LIB_ROOT="/var/lib/dokku"
 
+  echo "Create dokku user"
   sshcommand create dokku /usr/bin/dokku &>/dev/null
 
+  echo "Add dokku user to docker group"
   (egrep -i "^docker" /etc/group || groupadd docker) &>/dev/null
   usermod -aG docker dokku
 
   echo "Setting up storage directories"
-  mkdir -p ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
-  chown dokku:dokku ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
+  mkdir -p "$DOKKU_LIB_ROOT/data/storage"
+  chown dokku:dokku "$DOKKU_LIB_ROOT/data" "$DOKKU_LIB_ROOT/data/storage"
 
   echo "Setting up plugin directories"
   # should be replaced by `plugn init`
-  mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/available ${DOKKU_LIB_ROOT}/plugins/available
-  mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/enabled ${DOKKU_LIB_ROOT}/plugins/enabled
-  touch ${DOKKU_LIB_ROOT}/core-plugins/config.toml ${DOKKU_LIB_ROOT}/plugins/config.toml
+  mkdir -p "$DOKKU_LIB_ROOT/core-plugins/available"
+  mkdir -p "$DOKKU_LIB_ROOT/plugins/available"
+  mkdir -p "$DOKKU_LIB_ROOT/core-plugins/enabled"
+  mkdir -p "$DOKKU_LIB_ROOT/plugins/enabled"
+  touch "$DOKKU_LIB_ROOT/core-plugins/config.toml"
+  touch "$DOKKU_LIB_ROOT/plugins/config.toml"
 
   echo "Migrating old plugins"
-  find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+  find "$DOKKU_LIB_ROOT/plugins" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
     if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
       continue
-    elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
-      rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
-    elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-      mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available;
+    elif [ -f "$DOKKU_LIB_ROOT/plugins/$plugin/.core" ]; then
+      rm -rf "$DOKKU_LIB_ROOT/plugins/$plugin"
+    elif [ ! -d "$DOKKU_LIB_ROOT/plugins/available/$plugin" ]; then
+      mv "$DOKKU_LIB_ROOT/plugins/$plugin" "$DOKKU_LIB_ROOT/plugins/available"
     fi
   done
 
   echo "Enabling all core plugins"
-  find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
-    if [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-      ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin;
-      PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn enable $plugin
-      PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
+  find "$DOKKU_LIB_ROOT/core-plugins/available" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    if [ ! -d "$DOKKU_LIB_ROOT/plugins/available/$plugin" ]; then
+      ln -s "$DOKKU_LIB_ROOT/core-plugins/available/$plugin" "$DOKKU_LIB_ROOT/plugins/available/$plugin"
+      PLUGIN_PATH="$DOKKU_LIB_ROOT/core-plugins" plugn enable $plugin
+      PLUGIN_PATH="$DOKKU_LIB_ROOT/plugins" plugn enable $plugin
     fi
   done
-  find -L ${DOKKU_LIB_ROOT} -type l -delete
-  chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins
+  find -L $DOKKU_LIB_ROOT -type l -delete
+  chown dokku:dokku -R "$DOKKU_LIB_ROOT/plugins" "$DOKKU_LIB_ROOT/core-plugins"
 
   echo "Ensure proper sshcommand path"
-  echo '/usr/bin/dokku' > "${DOKKU_ROOT}/.sshcommand"
-  mkdir -p ${DOKKU_ROOT}/.ssh
-  touch ${DOKKU_ROOT}/.ssh/authorized_keys
+  echo /usr/bin/dokku > "$DOKKU_ROOT/.sshcommand"
+  mkdir -p "$DOKKU_ROOT/.ssh"
+  touch "$DOKKU_ROOT/.ssh/authorized_keys"
   if [[ -f .ssh/authorized_keys ]]; then
-    sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
-    rm "${DOKKU_ROOT}/.ssh/authorized_keys"
+    sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "$DOKKU_ROOT/.ssh/authorized_keys"
+    rm "$DOKKU_ROOT/.ssh/authorized_keys"
   fi
 
   echo "Install all core plugins"
   dokku plugin:install --core
 
-  rm -f ${DOKKU_ROOT}/VERSION
-  cp ${DOKKU_LIB_ROOT}/STABLE_VERSION ${DOKKU_ROOT}/VERSION
+  echo "Update version file"
+  rm -f "$DOKKU_ROOT/VERSION"
+  cp "$DOKKU_LIB_ROOT/VERSION" "$DOKKU_ROOT/VERSION"
 
-  hostname -f > "${DOKKU_ROOT}/HOSTNAME"
+  echo "Update hostname"
+  hostname -f > "$DOKKU_ROOT/HOSTNAME"
 
+  echo "Create nginx config folder"
   mkdir -p /etc/nginx/conf.d
+
+  echo "Add sudoers rule for dokku control over nginx"
   echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/systemctl reload nginx, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx
 
   echo "
@@ -72,21 +82,23 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  rm -f /etc/init/dokku-installer.conf
-  rm -f /etc/init/dokku-redeploy.conf
-  rm -f /etc/systemd/system/dokku-installer.conf
+  rm -f /var/cache/dokku-completion
   rm -f /etc/systemd/system/dokku-redeploy.service
+  rm -f /etc/systemd/system/dokku-retire.timer
+  rm -f /etc/systemd/system/dokku-retire.service
   rm -f /etc/update-motd.d/99-dokku
+  rm -f /etc/logrotate.d/dokku
 
-  rm -rf /etc/nginx/conf.d/dokku.conf
-  systemctl reload nginx
+  rm -f /etc/nginx/conf.d/dokku.conf
+  systemctl reload nginx &>/dev/null
 
   rm -rf /var/lib/dokku
   rm -rf /var/log/dokku
 
   userdel -r dokku &>/dev/null
+  rm -rf /home/dokku
 }