From a8e9851309e7ad5b4516c24e5baaf3f5821132b8 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sat, 7 Oct 2023 09:11:14 +0200 Subject: [PATCH] Fixes upgrade? --- manifest.toml | 20 ++------------------ scripts/restore | 5 +---- scripts/upgrade | 4 ++-- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5420e92..c8f43e5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,13 +9,12 @@ description.fr = "Un client web moderne pour Jellyfin basé sur Vue." version = "0.3.1~ynh1" -maintainers = ["johndoe"] +maintainers = [""] [upstream] license = "GPLv3" website = "https://github.com/jellyfin/jellyfin-vue" -# admindoc = "https://yunohost.org/packaging_apps" -# userdoc = "https://yunohost.org/apps" + code = "https://github.com/jellyfin/jellyfin-vue" fund = "https://opencollective.com/jellyfin" @@ -32,38 +31,23 @@ ram.runtime = "0M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by YunoHost's core type = "domain" [install.path] - # this is a generic question - ask strings are automatically handled by YunoHost's core type = "path" default = "/jellyfin-vue" [install.init_main_permission] - # this is a generic question - ask strings are automatically handled by YunoHost's core - # This won't be saved as setting and will instead be used to initialize the SSOwat permission type = "group" default = "visitors" [resources] - # See the packaging documentation for the full set - # of explanation regarding the behavior and properties for each of those [resources.sources] [resources.sources.main] - # This will pre-fetch the asset which can then be deployed during the install/upgrade scripts with : - # ynh_setup_source --dest_dir="$install_dir" - # You can also define other assets than "main" and add --source_id="foobar" in the previous command url = "https://github.com/jellyfin/jellyfin-vue/archive/refs/tags/0.3.1.tar.gz" sha256 = "49316b5f7ef57d09bfa31e5e461fac1866d03902f9b087d2c3ec5b294ed934f8" - - # These infos are used by https://github.com/YunoHost/apps/blob/master/tools/autoupdate_app_sources/autoupdate_app_sources.py - # to auto-update the previous asset urls and sha256sum + manifest version - # assuming the upstream's code repo is on github and relies on tags or releases - # See the 'sources' resource documentation for more details - autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/restore b/scripts/restore index f285c32..b15eb44 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,15 +17,12 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -# $install_dir will automatically be initialized with some decent -# permission by default ... however, you may need to recursively reapply -# ownership to all files such as after the ynh_setup_source step chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE THE NGINX CONFIGURATION #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 diff --git a/scripts/upgrade b/scripts/upgrade index ee5229d..6fdd467 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,8 +56,8 @@ then ynh_script_progression --message="Building Jellyfin Vue... (this will take some time and resources!)" --weight=24 - _patch_config_json "$install_dir/source" - _npm_build_install "$install_dir/source" "$install_dir/www" "$path/" + ynh_exec_as $app _patch_config_json "$install_dir/source" + ynh_exec_as $app _npm_build_install "$install_dir/source" "$install_dir/www" "$path/" fi # $install_dir will automatically be initialized with some decent