From 9589628817a18607d5a23b286de3d3fe4a607ae6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 10 May 2022 13:51:27 +0200
Subject: [PATCH] Fix

---
 conf/app.src       |  6 +++---
 manifest.json      |  6 +++---
 scripts/_common.sh |  4 ++--
 scripts/install    | 11 +++++------
 scripts/restore    |  4 ++--
 scripts/upgrade    |  1 +
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 51b1440..b1c9143 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/ampache/ampache/archive/5.2.1.tar.gz
-SOURCE_SUM=2ae11e34da6cc436bb03fbb44b460cd1f4758bdd8024231a2a21dac87e60d40d
+SOURCE_URL=https://github.com/ampache/ampache/releases/download/5.3.3/ampache-5.3.3_all_php8.0.zip
+SOURCE_SUM=c2cc99ba7d59e5fadf264cdf40f37af66393d93ec176f5151bf32799599e72fd
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
+SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 5b5fca2..15223d1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,13 +6,13 @@
         "en": "Web based audio/video streaming application",
         "fr": "Application de streaming audio et vidéo"
     },
-    "version": "5.2.1~ynh1",
+    "version": "5.3.3~ynh1",
     "url": "http://ampache.org",
     "upstream": {
         "license": "AGPL-3.0",
         "website": "http://ampache.org",
         "demo": "https://ampache.org/demo.html",
-        "admindoc": " https://github.com/ampache/ampache/wiki",
+        "admindoc": "https://github.com/ampache/ampache/wiki",
         "code": "https://github.com/ampache/ampache"
     },
     "license": "AGPL-3.0",
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services" : [
         "nginx",
-        "php7.4-fpm",
+        "php8.0-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index da28455..164e3b2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,10 +4,10 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
 # Composer version
-YNH_COMPOSER_VERSION="2.3.3"
+YNH_COMPOSER_VERSION="2.3.5"
 
 pkg_dependencies="libav-tools|ffmpeg php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-simplexml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-ldap"
 
diff --git a/scripts/install b/scripts/install
index 0609df8..7a50044 100644
--- a/scripts/install
+++ b/scripts/install
@@ -22,9 +22,10 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-admin_ampache=$YNH_APP_ARG_ADMIN
+admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 phpversion=$YNH_PHP_VERSION
+secret_key=$(ynh_string_random --length=24)
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -46,7 +47,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=admin --value=$admin_ampache
+ynh_app_setting_set --app=$app --key=admin --value=$admin
+ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -112,9 +114,6 @@ ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 #=================================================
 ynh_script_progression --message="Preconfiguring Ampache..." --weight=2
 
-secret_key=$(ynh_string_random --length=24)
-ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
-
 ynh_add_config --template="../conf/ampache.cfg.php" --destination="$final_path/config/ampache.cfg.php"
 
 chmod 600 $final_path/config/ampache.cfg.php
@@ -163,7 +162,7 @@ sleep 1
 ynh_script_progression --message="Loading admin database..."
 
 cp ../conf/admin.sql /tmp/
-ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin_ampache" --target_file=/tmp/admin.sql
+ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file=/tmp/admin.sql
 
 ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < /tmp/admin.sql
 
diff --git a/scripts/restore b/scripts/restore
index bb373a9..b7993de 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -57,7 +57,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..."
+ynh_script_progression --message="Restoring the app main directory..." --weight=3
 
 ynh_restore_file --origin_path="$final_path"
 
@@ -76,7 +76,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring PHP-FPM configuration..."
+ynh_script_progression --message="Restoring PHP-FPM configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 1ddf72a..40956bd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,6 +25,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
+phpversion=$YNH_PHP_VERSION
 
 #=================================================
 # CHECK VERSION