Merge pull request #102 from YunoHost-Apps/testing

Testing

README.md

@@ -5,7 +5,7 @@ Nextcloud for YunoHost
 own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
-**Shipped version:** 12.0.5
+**Shipped version:** 13.0.1
 
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 ![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)

check_process

@@ -12,6 +12,7 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
+		upgrade=1	from_commit=68c2f41da6b33bd8c949e5ba624bedba08c448be
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=1
@@ -33,3 +34,7 @@
 ;;; Options
 Email=
 Notification=none
+;;; Upgrade options
+	; commit=68c2f41da6b33bd8c949e5ba624bedba08c448be
+		name=Move patches to the right folder
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1&

manifest.json

@@ -6,7 +6,7 @@
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
         "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
-    "version": "12.0.5-1",
+    "version": "13.0.1~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {

scripts/_common.sh

@@ -3,7 +3,7 @@
 # COMMON VARIABLES
 #=================================================
 
-pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-redis php5-imagick imagemagick acl tar smbclient"
+pkg_dependencies="php5-gd php5-json php5-intl php5-mcrypt php5-curl php5-apcu php5-redis php5-ldap php5-imagick imagemagick acl tar smbclient"
 
 #=================================================
 # COMMON HELPERS

scripts/upgrade

@@ -176,6 +176,8 @@ do
     # then it's the last upgrade to do
     if [ "$major_version" -eq "$current_major_version" ]; then
 	current_major_version=last
+	# Patch nexcloud files only for the last upgrade.
+	cp -a ../sources/patches_last_version ../sources/patches
     fi
 
     # Load the value for this version

scripts/upgrade.d/upgrade.12.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Version cible de la mise à jour de Nextcloud
+next_version="13.0.0"
+
+# Nextcloud tarball checksum
+nextcloud_source_sha256="38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec"

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="12.0.5"
+next_version="13.0.1"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="c8be29ace6821079e881818266fe49d28812b5aa0c7d2e76511173d48828ca43"
+nextcloud_source_sha256="5743314a71e972ae46a14b36b37394d4545915aa5f32d9e12ba786d04c1f1d11"