Update dokku to 0.4.13

1 files changed, 26 insertions, 46 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 24d895aa8e65..89c29eafba92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,50 @@
 # Maintainer: Martin Mlynář <nexus+arch@smoula.net>
 pkgname=dokku
-pkgver=0.3.22
-pkgrel=4
+pkgver=0.4.13
+pkgrel=2
 pkgdesc="Docker powered mini-Heroku in around 100 lines of Bash."
-arch=(i686 x86_64)
-url="https://github.com/progrium/dokku"
+arch=(any)
+url="https://github.com/dokku/dokku"
 license=(MIT)
 depends=(
 	'docker'
 	'nginx'
-)
-makedepends=(
-	'go'
+	'plugn'
+	'sshcommand'
+	'herokuish'
 )
 
-#https://raw.githubusercontent.com/progrium/pluginhook/master/pluginhook.go
-#https://raw.githubusercontent.com/progrium/sshcommand/master/sshcommand
 source=(
-  "git+https://github.com/progrium/dokku.git#tag=v0.3.22"
+#  "https://github.com/dokku/dokku/archive/v${pkgver}.zip"
+  "https://github.com/MorrisJobke/dokku/archive/arch-linux.zip"
   "${pkgname}.install"
-  "pluginhook.go"
-  "sshcommand"
-  "dokku-redeploy.service"
-  "nginx-dokku.conf"
-  "nginx-reload.patch"
 )
 sha256sums=(
-  'SKIP'
-  'ce4935c51cff475e918c698d82d0735fa5b766fb8e576df5bb6eb5bf5259ffdd'
-  'a8be92d37d9e99e2f5d0b44aed2451dc590daa7e5366b5cb2ba3197fb0ae65b0'
-  '610eb140386de622ea46e6144be9f6f0a130887f94005319a395aed081d95879'
-  '1d0557dd1f8cb0b0f39ac011c69fc6224e287f34cc7974f3420b608829d36ff1'
-  'a5c81c91f3858d2325bd60a1b63efa5b71cc42c98746bcf1dd47668ccb5eeead'
-  '9b011c60a14bb9a74576c4bf55e785aa6757fdb6a280f73737629cd34bb626b7'
+  'ecd18ced116e9ed321903a97d2fe398bdbb3eb80333fcfaa880e0e8f9b598077'
+  '91681fac3bde0a83105a7f767b1e7d3d02db40137113b2842dc1aa38abedd9dd'
 )
 install=${pkgname}.install
 
-build() {
-  cd "${srcdir}/"
-  export GOPATH="${srcdir}/"
-  go get "golang.org/x/crypto/ssh/terminal"
-  GOOS=linux go build -o pluginhook.linux
-}
-
 package() {
   cd "${srcdir}/"
 
-  patch -p0 < ../nginx-reload.patch
-
-  install -Dm755 sshcommand "${pkgdir}"/usr/bin/sshcommand
-  install -Dm755 pluginhook.linux "${pkgdir}"/usr/bin/pluginhook
-  install -Dm644 dokku-redeploy.service "$pkgdir"/usr/lib/systemd/system/dokku-redeploy.service
-  install -Dm644 dokku-redeploy.service "$pkgdir"/usr/lib/systemd/system/dokku-redeploy.service
-  install -Dm644 nginx-dokku.conf "$pkgdir"/etc/nginx/conf.d/dokku.conf
-
-  sed -i 's#\$DOKKU_ROOT#/var/dokku#' "$pkgdir"/etc/nginx/conf.d/dokku.conf
-
   cd "$pkgname"
+  CORE_PLUGINS_PATH="${pkgdir}/var/lib/dokku/core-plugins/"
   PLUGINS_PATH="${pkgdir}/var/lib/dokku/plugins/"
   install -Dm755 dokku "${pkgdir}/usr/bin/dokku"
-  mkdir -p ${PLUGINS_PATH}
+
+  mkdir -p ${CORE_PLUGINS_PATH} ${PLUGINS_PATH}
+  test -d ${CORE_PLUGINS_PATH}/enabled || PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn init
+  test -d ${PLUGINS_PATH}/enabled || PLUGIN_PATH=${PLUGINS_PATH} plugn init
   find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do \
-    rm -Rf ${PLUGINS_PATH}/$plugin && \
-    cp -R plugins/$plugin ${PLUGINS_PATH} && \
-    touch ${PLUGINS_PATH}/$plugin/.core; \
-    rm -f ${PLUGINS_PATH}/$plugin/install
-  done
+    rm -Rf ${CORE_PLUGINS_PATH}/available/$plugin && \
+    rm -Rf ${PLUGINS_PATH}/available/$plugin && \
+    rm -rf ${CORE_PLUGINS_PATH}/$plugin && \
+    rm -rf ${PLUGINS_PATH}/$plugin && \
+    cp -R plugins/$plugin ${CORE_PLUGINS_PATH}/available && \
+    ln -s ${CORE_PLUGINS_PATH}/available/$plugin ${PLUGINS_PATH}/available; \
+    find "$pkgdir"/var/lib/dokku/ -xtype l -delete;\
+    PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $plugin ;\
+    PLUGIN_PATH=${PLUGINS_PATH} plugn enable $plugin ;\
+    done
 }
-