From 0938148aac4d3d9f1e1208e5b07e070830305d30 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Mon, 4 Dec 2017 21:36:01 +0100
Subject: [PATCH 1/3] Upgrade to upstream version 12.0.4

---
 README.md                         | 2 +-
 manifest.json                     | 4 ++--
 scripts/upgrade.d/upgrade.last.sh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8678f9e..26bf399 100644
--- a/README.md
+++ b/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.3
+**Shipped version:** 12.0.4
 
 [![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)
diff --git a/manifest.json b/manifest.json
index 59d803a..ba96c7e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,9 +6,9 @@
         "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.3",
+    "version": "12.0.4-1",
     "url": "https://nextcloud.com",
-    "license": "AGPL-3",
+    "license": "AGPL-3.0",
     "maintainer": {
         "name": "-",
         "email": "-"
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index 3e659ce..42df94c 100755
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="12.0.3"
+next_version="12.0.4"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="88bcaccba886d0e5a145b15fe216d652ab68a0a4c089a102f1fa1e78e6ddfb71"
\ No newline at end of file
+nextcloud_source_sha256="654161a74ceaf9a60c7731d7d6702e6710a972633a97955d16f01abeb09d09b6"
\ No newline at end of file

From eb040b37803f0e5457bb8d5c502c5c68db286801 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Mon, 4 Dec 2017 21:36:42 +0100
Subject: [PATCH 2/3] Minor linter fixes

---
 scripts/backup  | 9 ++++++++-
 scripts/restore | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/scripts/backup b/scripts/backup
index de9fd26..4210504 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -21,6 +21,13 @@ fi
 source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # LOAD SETTINGS
 #=================================================
@@ -82,5 +89,5 @@ if [ -z $backup_core_only ]
 then
 	ynh_backup "/home/yunohost.app/${app}/data"
 else
-	echo "Data dir will not saved, because backup_core_only is set." >&2
+	echo "Data dir will not be saved, because backup_core_only is set." >&2
 fi
diff --git a/scripts/restore b/scripts/restore
index 71b0a30..b69a524 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -21,6 +21,13 @@ fi
 source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # LOAD SETTINGS
 #=================================================

From 6f26cb657fb258b1fe94d2bf69b33fd64ffb4ec6 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Mon, 4 Dec 2017 21:55:12 +0100
Subject: [PATCH 3/3] Remove useless set -eu command

---
 scripts/backup  | 5 -----
 scripts/restore | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 4210504..aecf0c0 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -3,11 +3,6 @@
 #=================================================
 # GENERIC START
 #=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit on command errors and treat access to unset variables as an error
-set -eu
 
 #=================================================
 # IMPORT GENERIC HELPERS
diff --git a/scripts/restore b/scripts/restore
index b69a524..b476d80 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -3,11 +3,6 @@
 #=================================================
 # GENERIC START
 #=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit on command errors and treat access to unset variables as an error
-set -eu
 
 #=================================================
 # IMPORT GENERIC HELPERS