From ac0323964f3318d9fa182190889b98d3aa5fa4fb Mon Sep 17 00:00:00 2001
From: enoch85 <enoch85@gmail.com>
Date: Mon, 13 Jun 2016 22:25:10 +0200
Subject: [PATCH] some more changes to testing install script

---
 ...n-profile.sh => change-ncadmin-profile.sh} |  0
 static/security.sh                            |  1 -
 testing/nextcloud_install_testing.sh          | 55 ++++++++++---------
 3 files changed, 28 insertions(+), 28 deletions(-)
 rename static/{change-ocadmin-profile.sh => change-ncadmin-profile.sh} (100%)

diff --git a/static/change-ocadmin-profile.sh b/static/change-ncadmin-profile.sh
similarity index 100%
rename from static/change-ocadmin-profile.sh
rename to static/change-ncadmin-profile.sh
diff --git a/static/security.sh b/static/security.sh
index 0bed7f9c..6abcdf42 100644
--- a/static/security.sh
+++ b/static/security.sh
@@ -76,5 +76,4 @@ then
         exit 1
 else
 	echo "Security added!"
-	exit 0
 fi
diff --git a/testing/nextcloud_install_testing.sh b/testing/nextcloud_install_testing.sh
index 80eeb541..df182d9a 100644
--- a/testing/nextcloud_install_testing.sh
+++ b/testing/nextcloud_install_testing.sh
@@ -236,7 +236,8 @@ apt-get install -y \
 	php7.0-sqlite3 \
 	php7.0-curl \
 	php7.0-xml \
-	php7.0-zip
+	php7.0-zip \
+	php7.0-mbstring
 
 # Install Unzip
 apt-get install unzip -y
@@ -420,40 +421,40 @@ mv documents-master/ documents/
 fi
 
 # Enable documents
-if [ -d $NCPATH/apps/documents ]; then
-sudo -u www-data php $NCPATH/occ app:enable documents
-sudo -u www-data php $NCPATH/occ config:system:set preview_libreoffice_path --value="/usr/bin/libreoffice"
-fi
+#if [ -d $NCPATH/apps/documents ]; then
+#sudo -u www-data php $NCPATH/occ app:enable documents
+#sudo -u www-data php $NCPATH/occ config:system:set preview_libreoffice_path --value="/usr/bin/libreoffice"
+#fi
 
 # Download and install Contacts
-if [ -d $NCPATH/apps/contacts ]; then
-sleep 1
-else
-wget -q $CONVER_REPO/$CONVER/$CONVER_FILE -P $NCPATH/apps
-tar -zxf $NCPATH/apps/$CONVER_FILE -C $NCPATH/apps
-cd $NCPATH/apps
-rm $CONVER_FILE
-fi
+#if [ -d $NCPATH/apps/contacts ]; then
+#sleep 1
+#else
+#wget -q $CONVER_REPO/$CONVER/$CONVER_FILE -P $NCPATH/apps
+#tar -zxf $NCPATH/apps/$CONVER_FILE -C $NCPATH/apps
+#cd $NCPATH/apps
+#rm $CONVER_FILE
+#fi
 
 # Enable Contacts
-if [ -d $NCPATH/apps/contacts ]; then
-sudo -u www-data php $NCPATH/occ app:enable contacts
-fi
+#if [ -d $NCPATH/apps/contacts ]; then
+#sudo -u www-data php $NCPATH/occ app:enable contacts
+#fi
 
 # Download and install Calendar
-if [ -d $NCPATH/apps/calendar ]; then
-sleep 1
-else
-wget -q $CALVER_REPO/$CALVER/$CALVER_FILE -P $NCPATH/apps
-tar -zxf $NCPATH/apps/$CALVER_FILE -C $NCPATH/apps
-cd $NCPATH/apps
-rm $CALVER_FILE
-fi
+#if [ -d $NCPATH/apps/calendar ]; then
+#sleep 1
+#else
+#wget -q $CALVER_REPO/$CALVER/$CALVER_FILE -P $NCPATH/apps
+#tar -zxf $NCPATH/apps/$CALVER_FILE -C $NCPATH/apps
+#cd $NCPATH/apps
+#rm $CALVER_FILE
+#fi
 
 # Enable Calendar
-if [ -d $NCPATH/apps/calendar ]; then
-sudo -u www-data php $NCPATH/occ app:enable calendar
-fi
+#if [ -d $NCPATH/apps/calendar ]; then
+#sudo -u www-data php $NCPATH/occ app:enable calendar
+#fi
 
 # Set secure permissions final (./data/.htaccess has wrong permissions otherwise)
 bash $SCRIPTS/setup_secure_permissions_nextcloud.sh