remove .install, set perms in package()

4 files changed, 13 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3aad51975acb..4f5534f2e662 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue Dec 13 17:41:39 UTC 2016
+# Tue Dec 20 12:49:51 UTC 2016
 pkgbase = nextcloud
 	pkgdesc = A safe home for all your data. Secure, under your control and developed in an open, transparent and trustworthy way
 	pkgver = 11.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://nextcloud.com
-	install = nextcloud.install
 	arch = any
 	license = AGPL
 	depends = php
@@ -31,7 +30,7 @@ pkgbase = nextcloud
 	md5sums = 2c3e6655c6fc81b02b5ac824e5f6ad06
 	md5sums = SKIP
 	md5sums = bc2b02b0562b7a58e660e33acd4202bc
-	md5sums = 0c996a76cf39b2bccde8d74ac062895e
+	md5sums = 13780e7de28cd3a8796d3345a2bf8d42
 
 pkgname = nextcloud
 
diff --git a/PKGBUILD b/PKGBUILD
index 659f1ed1d4e0..70a04c71f045 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=nextcloud
 pkgver=11.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A safe home for all your data. Secure, under your control and developed in an open, transparent and trustworthy way"
 url="https://nextcloud.com"
 arch=('any')
@@ -21,7 +21,6 @@ optdepends=('php-apache: to use the Apache web server'
       'ffmpeg: file preview'
       'libreoffice: file preview')
 options=('!strip')
-install=${pkgname}.install
 validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A')
 source=("https://download.nextcloud.com/server/releases/nextcloud-${pkgver}.tar.bz2"{,.asc}
   "apache.example.conf"
@@ -30,7 +29,7 @@ source=("https://download.nextcloud.com/server/releases/nextcloud-${pkgver}.tar.
 md5sums=('2c3e6655c6fc81b02b5ac824e5f6ad06'
          'SKIP'
          'bc2b02b0562b7a58e660e33acd4202bc'
-         '0c996a76cf39b2bccde8d74ac062895e')
+         '13780e7de28cd3a8796d3345a2bf8d42')
 _fetchedMD5=$(curl -sS https://download.nextcloud.com/server/releases/nextcloud-${pkgver}.tar.bz2.md5)
 IFS=' '; _arrFetchedMD5=($_fetchedMD5); unset IFS;
 _fetchedMD5=${_arrFetchedMD5[0]}
@@ -49,10 +48,8 @@ package() {
   mkdir -p "${pkgdir}/usr/share/webapps"
   cp -a nextcloud "${pkgdir}/usr/share/webapps/."
   
-  find "${pkgdir}/usr/share/webapps/nextcloud/" -type f -print0 | xargs -0 chmod 0640
-  find "${pkgdir}/usr/share/webapps/nextcloud/" -type d -print0 | xargs -0 chmod 0750
-  chmod 0664 "${pkgdir}/usr/share/webapps/nextcloud/.user.ini"
-  chmod 0664 "${pkgdir}/usr/share/webapps/nextcloud/.htaccess"
+  # set the proper permissions
+  "${srcdir}/set-nc-perms.sh" runtime "${pkgdir}/usr/share/webapps/nextcloud"
  
   install -D -m755 "${srcdir}/set-nc-perms.sh" "${pkgdir}/usr/bin/set-nc-perms"
   install -m644 -D "${srcdir}/apache.example.conf" -t "${pkgdir}/etc/webapps/nextcloud"
diff --git a/nextcloud.install b/nextcloud.install
deleted file mode 100644
index 5a46de13a0d5..000000000000
--- a/nextcloud.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_install () {
-  set-nc-perms runtime
-}
-
-post_upgrade() {
-  set-nc-perms runtime
-}
diff --git a/set-nc-perms.sh b/set-nc-perms.sh
index 19ddef43466f..849b565ad5ad 100755
--- a/set-nc-perms.sh
+++ b/set-nc-perms.sh
@@ -3,7 +3,12 @@
 # run with the argument "runtime" to set the proper runtime permissions
 # run with the argument "upgrade" to set the proper upgrade permissions
 
-ncpath='/usr/share/webapps/nextcloud'
+if [ -d "$2/apps" ]; then
+  ncpath="$2"
+else
+  ncpath='/usr/share/webapps/nextcloud'
+fi
+
 htuser='http'
 htgroup='http'
 rootuser='root'