Merge pull request #44 from nextcloud/prepare-12.0.5v12.0.5

Prepare 12.0.5

4 files changed, 4 insertions, 4 deletions

diff --git a/Dockerfile b/Dockerfile
index 2d6fafa..604a810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@
 
 FROM ubuntu:16.04
 
-COPY resources/nextcloud-12.0.4.tar.bz2 /root/nextcloud.tar.bz2
+ADD https://download.nextcloud.com/server/releases/nextcloud-12.0.5.tar.bz2 /root/nextcloud.tar.bz2
 COPY resources/entrypoint.sh /usr/sbin/
 COPY resources/60-nextcloud.ini /etc/php/7.0/apache2/conf.d/
 COPY resources/60-nextcloud.ini /etc/php/7.0/cli/conf.d/
diff --git a/Makefile b/Makefile
index 933540a..1e8b645 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 app_name=nextcloud
-app_version=12.0.4-0
+app_version=12.0.5-0
 
 ucs_version=4.1
 
diff --git a/resources/nextcloud-12.0.4.tar.bz2 b/resources/nextcloud-12.0.4.tar.bz2
deleted file mode 100644
index 677733b..0000000
--- a/resources/nextcloud-12.0.4.tar.bz2
+++ /dev/null
diff --git a/setup b/setup
index 9bafaa1..fa0a81b 100644
--- a/setup
+++ b/setup
@@ -90,7 +90,7 @@ if [ "$NC_IS_UPGRADE" -eq 0 ] ; then
     if [ "$NC_APPLIANCE" = true ]; then
         # Heads up: in Nc 13 we will have occ app:install <appid>
         EXTRA_APP_URLS=(\
-            https://download.nextcloud.com/server/apps/zenodo-0.9.3.tar.gz \
+            https://github.com/nextcloud/zenodo/releases/download/v0.9.4/zenodo-0.9.4.tar.gz \
             https://download.nextcloud.com/server/apps/dashboard-4.0.5.tar.gz \
             https://github.com/nextcloud/circles/releases/download/v0.13.6/circles-0.13.6.tar.gz \
             https://download.nextcloud.com/server/apps/groupfolders-1.1.0.tar.gz \
@@ -131,7 +131,7 @@ else
         cd apps
         chown -R www-data:nogroup *
         cd ..
-    ]
+    fi
     # attempt to re-enable disabled apps
     DISABLED_APPS=( $(cat "$UPGRADE_LOGFILE" | grep "Disabled 3rd-party app:" | cut -d ":" -f 2 | egrep -o "[a-z]+[a-z0-9_]*[a-z0-9]+") )
     for APPID in "${DISABLED_APPS[@]}" ; do