From d0b65b69558b6a1a98761eb7be0b34b4ccb7d6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 19 Jun 2021 18:36:44 +0200
Subject: [PATCH] Testing (#36)

* use crystal_1.0.0
---
 README.md        | 24 ++++++------------------
 README_fr.md     | 36 ++++++++++++++----------------------
 check_process    |  8 +++++++-
 conf/crystal.src |  6 +++---
 manifest.json    |  2 +-
 scripts/install  |  2 +-
 scripts/restore  |  2 +-
 scripts/upgrade  | 12 +++++++-----
 8 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index a7aed58..68953de 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-
-
----
-
 <!--
 N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
 It shall NOT be edited by hand.
@@ -9,30 +5,25 @@ It shall NOT be edited by hand.
 
 # Invidious for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg)
-[![Install invidious with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious)
+[![Integration level](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg)  
+[![Install Invidious with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install invidious quickly and simply on a YunoHost server.
+> *This package allows you to install Invidious quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
 Alternative front-end to YouTube
 
-**Shipped version:** 0.20.1~ynh9
+**Shipped version:** 0.20.1~ynh10
 
 **Demo:** https://invidious.site/
 
-
 ## Screenshots
 
-
-   ![](./doc/screenshots/screenshot.png)
-
-
-
+![](./doc/screenshots/screenshot.png)
 
 ## Disclaimers / important information
 
@@ -40,14 +31,11 @@ Alternative front-end to YouTube
 
 You can configure Invidious by modifying the configuration file `/var/www/invidious/config/config.yml` with the help of this [documentation](https://github.com/iv-org/documentation/blob/master/Configuration.md).
 
-
-
 ## Documentation and resources
 
-
 * Official user documentation: https://github.com/iv-org/documentation
 * Official admin documentation: https://yunohost.org/packaging_apps
-* Upstream app code repository:  https://github.com/iv-org/invidious
+* Upstream app code repository: https://github.com/iv-org/invidious
 * YunoHost documentation for this app: https://yunohost.org/app_invidious
 * Report a bug: https://github.com/YunoHost-Apps/invidious_ynh/issues
 
diff --git a/README_fr.md b/README_fr.md
index 37f9f8f..ae4677f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,30 +1,25 @@
 # Invidious pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg)
-[![Installer invidious avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious)
+[![Niveau d'intégration](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg)  
+[![Installer Invidious avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install invidious quickly and simply on a YunoHost server.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+> *Ce package vous permet d'installer Invidious rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
 
 Front-end alternatif à YouTube
 
-**Version incluse:** 0.20.1~ynh9
-
-**Démo:** https://invidious.site/
+**Version incluse :** 0.20.1~ynh10
 
+**Démo :** https://invidious.site/
 
 ## Captures d'écran
 
-
-   ![](./doc/screenshots/screenshot.png)
-
-
-
+![](./doc/screenshots/screenshot.png)
 
 ## Avertissements / informations importantes
 
@@ -32,16 +27,13 @@ Front-end alternatif à YouTube
 
 Vous pouvez configurer Invidious en modifiant le fichier de configuration `/var/www/invidious/config/config.yaml` avec l'aide de cette [documentation](https://github.com/iv-org/documentation/blob/master/Configuration.md).
 
-
-
 ## Documentations et ressources
 
-
-* Documentation officielle utilisateur: https://github.com/iv-org/documentation
-* Documentation officielle de l'admin: https://yunohost.org/packaging_apps
-* Dépôt de code officiel de l'app:  https://github.com/iv-org/invidious
-* Documentation YunoHost pour cette app: https://yunohost.org/app_invidious
-* Signaler un bug: https://github.com/YunoHost-Apps/invidious_ynh/issues
+* Documentation officielle utilisateur : https://github.com/iv-org/documentation
+* Documentation officielle de l'admin : https://yunohost.org/packaging_apps
+* Dépôt de code officiel de l'app : https://github.com/iv-org/invidious
+* Documentation YunoHost pour cette app : https://yunohost.org/app_invidious
+* Signaler un bug : https://github.com/YunoHost-Apps/invidious_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -50,8 +42,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno
 Pour essayer la branche testing, procédez comme suit.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/invidious_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade invidious -u https://github.com/YunoHost-Apps/invidious_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/check_process b/check_process
index 564d32f..9ad524f 100644
--- a/check_process
+++ b/check_process
@@ -12,9 +12,15 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=e32e33ed1d76bea6d493ec3ca9a24290aeeccc8e
 		backup_restore=1
 		multi_instance=0
 		change_url=0
 ;;; Options
 Email=
-Notification=none
\ No newline at end of file
+Notification=none
+;;; Upgrade options
+	; commit=e32e33ed1d76bea6d493ec3ca9a24290aeeccc8e
+		name=Testing (#23)
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
+
diff --git a/conf/crystal.src b/conf/crystal.src
index 14ed0e2..b7d8145 100644
--- a/conf/crystal.src
+++ b/conf/crystal.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/crystal-lang/crystal/releases/download/0.36.1/crystal_0.36.1-1_amd64.deb
-SOURCE_SUM=bac79d5513911fc6ad1cf9d05571132e36a139e7cf0808acee518c57ab1aa563
+SOURCE_URL=https://github.com/crystal-lang/crystal/releases/download/1.0.0/crystal_1.0.0-1_amd64.deb
+SOURCE_SUM=bc4c15bdfb32ae08daef40728fc8a1da260a4defd225f7ba309404d9e77dcd8d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=deb
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=crystal_0.36.1-1_amd64.deb
+SOURCE_FILENAME=crystal_1.0.0-1_amd64.deb
 SOURCE_EXTRACT=false
diff --git a/manifest.json b/manifest.json
index a433a38..1794e2d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Alternative front-end to YouTube",
         "fr": "Front-end alternatif à YouTube"
     },
-    "version": "0.20.1~ynh9",
+    "version": "0.20.1~ynh10",
     "url": "https://invidio.us/",
     "upstream": {
         "license": "GPL-3.0-only",
diff --git a/scripts/install b/scripts/install
index eead517..24c23d9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -70,7 +70,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 tempdir="$(mktemp -d)"
 ynh_setup_source --dest_dir=$tempdir --source_id=crystal
-ynh_exec_warn_less dpkg -i $tempdir/crystal_0.36.1-1_amd64.deb
+ynh_exec_warn_less dpkg -i $tempdir/crystal_1.0.0-1_amd64.deb
 
 #=================================================
 # CREATE DEDICATED USER
diff --git a/scripts/restore b/scripts/restore
index 2d28806..3c08df3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -83,7 +83,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 tempdir="$(mktemp -d)"
 ynh_setup_source --dest_dir=$tempdir --source_id=crystal
-ynh_exec_warn_less dpkg -i $tempdir/crystal_0.36.1-1_amd64.deb
+ynh_exec_warn_less dpkg -i $tempdir/crystal_1.0.0-1_amd64.deb
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 160e85b..142261c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,9 +82,10 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=8
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+
 tempdir="$(mktemp -d)"
 ynh_setup_source --dest_dir=$tempdir --source_id=crystal
-ynh_exec_warn_less dpkg -i $tempdir/crystal_0.36.1-1_amd64.deb
+ynh_exec_warn_less dpkg -i $tempdir/crystal_1.0.0-1_amd64.deb
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -100,13 +101,14 @@ then
 	cp -a "$final_path/config/config.yml" "$tmpdir/config.yml"
 
 	# Remove the app directory securely
-	ynh_secure_remove --file=$final_path
+	#ynh_secure_remove --file=$final_path
 
-	git clone https://github.com/iv-org/invidious "$final_path" --quiet
-	pushd "$final_path" || ynh_die
+	#git clone https://github.com/iv-org/invidious "$final_path" --quiet
+	pushd $final_path
+		git pull
 		shards update && shards install
 		crystal build $final_path/src/invidious.cr --release
-	popd || ynh_die
+	popd
 
 	# Copy the admin saved settings from tmp directory to final path	
 	cp -a "$tmpdir/config.yml" "$final_path/config/config.yml"