From 71ca75ae63e48aebabe4272cc7500512e4bd96b9 Mon Sep 17 00:00:00 2001
From: Salamandar <felix@piedallu.me>
Date: Tue, 12 Jun 2018 14:32:44 +0200
Subject: [PATCH 1/2] Fixes: * use ynh_setup_source instead of wget * do not
 fait on remove

---
 scripts/install | 4 ++--
 scripts/remove  | 4 +++-
 scripts/upgrade | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 83d5123..a4036c2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -75,7 +75,7 @@ config_nginx
 config_gitea
 
 # Install gitea
-wget -O gitea https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-amd64 $final_path/gitea
+ynh_setup_source $final_path $architecture
 
 # Set permissions
 set_permission
@@ -112,4 +112,4 @@ ynh_use_logrotate "/var/log/$app"
 
 # Reload services
 ynh_check_starting "Serving [::]:$port with pid" "/var/log/$app/gitea.log"
-systemctl gitea restart
\ No newline at end of file
+systemctl restart gitea
diff --git a/scripts/remove b/scripts/remove
index 681dd01..c9a5682 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,4 +43,6 @@ ynh_system_user_delete $app
 ynh_remove_systemd_config
 
 # Remove monitor
-yunohost service remove "$app"
\ No newline at end of file
+yunohost service remove "$app"
+
+true # Do not fail if remove after install error
diff --git a/scripts/upgrade b/scripts/upgrade
index 260e566..8c4b740 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -67,7 +67,7 @@ then
     ynh_secure_remove /opt/gogs
     ynh_secure_remove /etc/gogs
     ynh_secure_remove /opt/gogs_src
-    
+
     # create needed directories if not already created
     create_dir
 fi

From 59c3b7e1f6ec7aa8238f26f080e50fa7144f8426 Mon Sep 17 00:00:00 2001
From: Salamandar <felix@piedallu.me>
Date: Tue, 12 Jun 2018 14:33:21 +0200
Subject: [PATCH 2/2] Upgrade to 1.4.2

---
 conf/arm.src    | 2 +-
 conf/i386.src   | 2 +-
 conf/x86-64.src | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/arm.src b/conf/arm.src
index ba15afb..5b80798 100644
--- a/conf/arm.src
+++ b/conf/arm.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-arm-6
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.2/gitea-1.4.2-linux-arm-6
 SOURCE_SUM=b1b20d5905cd275b384da2a08d36ed0730801f23fb33df5c45302c9a6ec62dc6
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
diff --git a/conf/i386.src b/conf/i386.src
index cb7d0ef..0b0ced5 100644
--- a/conf/i386.src
+++ b/conf/i386.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-386
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.2/gitea-1.4.2-linux-386
 SOURCE_SUM=1b746cccffca446876ccc71efe328699f002622dab1d438e2142c8d7c23a22d7
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
diff --git a/conf/x86-64.src b/conf/x86-64.src
index 483867f..5a6ef10 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-amd64
+SOURCE_URL=https://github.com/go-gitea/gitea/releases/download/v1.4.2/gitea-1.4.2-linux-amd64
 SOURCE_SUM=4f37b280eb9dcde7820e801e51ca07682faee703c220548da2f8aa9b6adb5231
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256