nc-datadir: avoid using occ for faster execution

nextcloud · May 3, 2018 · 28d2332 · 28d2332
1 parent 73bc22a
commit 28d2332
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 
-[v0.54.0](https://github.com/nextcloud/nextcloudpi/commit/07fa32f) (2018-04-27) update to NC 13.0.2
+[v0.54.3](https://github.com/nextcloud/nextcloudpi/commit/921b583) (2018-05-03) nc-datadir: avoid using occ for faster execution
+
+[v0.54.2 ](https://github.com/nextcloud/nextcloudpi/commit/ebfb7f1) (2018-05-03) samba: restart after configuration change
+
+[v0.54.1 ](https://github.com/nextcloud/nextcloudpi/commit/997515b) (2018-04-27) nc-snapshot-sync: upgrade
+
+[v0.54.0 ](https://github.com/nextcloud/nextcloudpi/commit/a979a5f) (2018-04-27) update to NC 13.0.2
 
 [v0.53.33](https://github.com/nextcloud/nextcloudpi/commit/d510cfc) (2018-04-25) nc-info: provide timeout for wget
 

diff --git a/etc/ncp-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh
@@ -23,8 +23,7 @@ because they do not provide a compatible user/permissions system"
 is_active()
 {
   local SRCDIR
-  [[ "$( id -u )" != 33 ]] && local SUDO="sudo -u www-data"
-  SRCDIR=$( $SUDO php /var/www/nextcloud/occ config:system:get datadirectory ) || return 1;
+  SRCDIR="$( grep datadirectory /var/www/nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )" || return 1
   [[ "$SRCDIR" != "/var/www/nextcloud/data" ]]
 }