From 7573b06c6db771d74b3447cff559da4d4a040c16 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 11 Apr 2020 01:40:51 -0500
Subject: [PATCH] Rename file

---
 quick_nextcloud.sh => jra_nextcloud.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
 rename quick_nextcloud.sh => jra_nextcloud.sh (96%)

diff --git a/quick_nextcloud.sh b/jra_nextcloud.sh
similarity index 96%
rename from quick_nextcloud.sh
rename to jra_nextcloud.sh
index e57d5f9..04922e6 100644
--- a/quick_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -140,7 +140,6 @@ systemctl restart php$PHPVER-fpm.service
 #--------------------------------------------------
 
 echo -e "\n---- Creating the MariaDB User  ----"
-cd /tmp
 
 mysql -u root <<DB
 CREATE DATABASE nextcloud_db;
@@ -310,7 +309,7 @@ systemctl reload nginx
 echo "
   Latest version to be installed: $STABLEVERSION
 "
-cd /tmp && wget $NC_REPO/$STABLEVERSION.zip
+curl -s $NC_REPO/$STABLEVERSION.zip > /tmp/
 unzip -q $STABLEVERSION.zip
 sudo mv nextcloud $NC_PATH
 
@@ -320,18 +319,15 @@ chmod -R 755 $NC_PATH
 if $(dpkg --compare-versions "$NCVERSION" "le" "18.0.3"); then 
 echo "
 -> Patching #425 (scssphp/src/Compiler.php)..."
-cd $NC_PATH/3rdparty/leafo/scssphp/src
-sudo -u www-data curl -s https://nc.switnet.net/s/J89EmtEKcgj9AwP/download \
-> patch_425_3thy.patch
-sudo -u www-data patch -p0  < patch_425_3thy.patch
-rm patch_425_3thy.patch
+#sudo -u www-data cp -s https://nc.switnet.net/s/J89EmtEKcgj9AwP/download \
+#> $NC_PATH/3rdparty/leafo/scssphp/src/patch_425_3thy.patch
+sudo -u www-data patch -d "$NC_PATH/3rdparty/leafo/scssphp/src/" -p0  < files/patch_425_3thy.patch
 fi
 
 echo "
 Database installation...
 "
-cd $NC_PATH
-sudo -u www-data php occ maintenance:install \
+sudo -u www-data php $NC_PATH/occ maintenance:install \
 --database=mysql \
 --database-name="$NC_DB" \
 --database-user="$NC_DB_USER" \
@@ -352,8 +348,8 @@ Addding & Setting up Files External App for Local storage...
 "
 sudo -u www-data php occ app:install files_external
 sudo -u www-data php occ app:enable files_external
-curl -s https://nc.switnet.net/s/r22QLNMYzLcay39/download > /tmp/jb-qnci-ef.json
-sudo -u www-data php $NC_PATH/occ files_external:import /tmp/jb-qnci-ef.json
+#curl -s https://nc.switnet.net/s/r22QLNMYzLcay39/download > /tmp/jb-qnci-ef.json
+sudo -u www-data php $NC_PATH/occ files_external:import files/jb-qnci-ef.json
 
 usermod -a -G jibri www-data
 chown -R jibri:www-data $DIR_RECORD