From d911bcaad1aceeb68d65ae1dca9a719a8885122a Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sat, 11 Apr 2020 10:58:37 -0500
Subject: [PATCH] Fix patching and nc download

---
 jra_nextcloud.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index dac8b69..9396791 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -316,8 +316,8 @@ echo "
   Latest version to be installed: $STABLEVERSION
 "
 curl -s $NC_REPO/$STABLEVERSION.zip > /tmp/$STABLEVERSION.zip
-unzip -q $STABLEVERSION.zip
-sudo mv nextcloud $NC_PATH
+unzip -q /tmp/$STABLEVERSION.zip
+mv nextcloud $NC_PATH
 
 chown -R www-data:www-data $NC_PATH
 chmod -R 755 $NC_PATH
@@ -325,9 +325,7 @@ chmod -R 755 $NC_PATH
 if $(dpkg --compare-versions "$NCVERSION" "le" "18.0.3"); then 
 echo "
 -> Patching #425 (scssphp/src/Compiler.php)..."
-#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
+sudo -u www-data patch -d "$NC_PATH/3rdparty/leafo/scssphp/src/" -p0  < files/patch_425_3dty.patch
 fi
 
 echo "