From ba16b4c595150321c3a05f1ee2072eb4a76aa2d7 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Wed, 22 Sep 2021 10:29:15 +0200
Subject: [PATCH] [nextcloud-server] trailing / out of VHOST

Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
---
 n/nextcloud-server/SlackBuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/n/nextcloud-server/SlackBuild b/n/nextcloud-server/SlackBuild
index ab8cf31f..726de3f0 100755
--- a/n/nextcloud-server/SlackBuild
+++ b/n/nextcloud-server/SlackBuild
@@ -9,9 +9,9 @@ ARCH="noarch"	# hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-gwh}
 
-VHOST=${VHOST:-vhosts/$PRGNAM/}
+VHOST=${VHOST:-vhosts/$PRGNAM}
 VHOSTROOT=/var/www/${VHOST}
-DOCROOT=${DOCROOT:-/var/www/${VHOST}htdocs}
+DOCROOT=${DOCROOT:-/var/www/${VHOST}/htdocs}
 DATAROOT=${DATAROOT:-/home/nextcloud/data}
 
 PHPUSER=${PHPUSER:-apache}
@@ -99,11 +99,11 @@ config etc/logrotate.d/nextcloud.new
 
 chown -R $PHPUSER:$PHPGROUP $DOCROOT/apps
 
-grep -q "/var/www/${VHOST}htdocs/cron.php" /var/spool/cron/crontabs/apache || echo "*/15  *  *  *  * php -f /var/www/${VHOST}htdocs/cron.php" >> /var/spool/cron/crontabs/apache
-grep -q "/var/www/${VHOST}nextcloud-news-updater.rb" /var/spool/cron/crontabs/apache || echo "*/15  *  *  *  * php -f /var/www/${VHOST}nextcloud-news-updater.rb" >> /var/spool/cron/crontabs/apache
+grep -q "/var/www/${VHOST}/htdocs/cron.php" /var/spool/cron/crontabs/apache || echo "*/15  *  *  *  * php -f /var/www/${VHOST}/htdocs/cron.php" >> /var/spool/cron/crontabs/apache
+grep -q "/var/www/${VHOST}/nextcloud-news-updater.rb" /var/spool/cron/crontabs/apache || echo "*/15  *  *  *  * php -f /var/www/${VHOST}/nextcloud-news-updater.rb" >> /var/spool/cron/crontabs/apache
 
 echo "Upgrading database and applications"
-( cd /var/www/${VHOST}htdocs/
+( cd /var/www/${VHOST}/htdocs/
   sudo -u $PHPUSER php ./occ upgrade --quiet --no-interaction
 )
 echo "Post-installation process completed"