From 5a1273111b21434cfe7c713558707ee03688b4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 8 Dec 2023 23:22:04 +0100 Subject: [PATCH 1/5] Add url for toml schemas --- manifest.toml | 10 ++++++---- tests.toml | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifest.toml b/manifest.toml index 276be55..4f18b05 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "jellyseerr" @@ -26,13 +28,13 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - + [install.init_main_permission] type = "group" default = "visitors" [resources] - + [resources.sources] [resources.sources.main] @@ -44,9 +46,9 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] - + [resources.data_dir] - + [resources.permissions] main.url = "/" diff --git a/tests.toml b/tests.toml index 68e1c01..dcba2d4 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + test_format = 1.0 [default] @@ -5,13 +7,13 @@ test_format = 1.0 # ------------ # Tests to run # ------------ - + # ------------------------------- # Default args to use for install # ------------------------------- - - + + # ------------------------------- # Commits to test upgrade from - # ------------------------------- \ No newline at end of file + # ------------------------------- From d6b0cb485d4337e7eb452c577ff0e0b952e3df90 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 11 Mar 2024 16:05:37 +0100 Subject: [PATCH 2/5] [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8458172..f3942a4 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,7 +45,7 @@ then mv ${install_dir} ${install_dir}.old # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 # restore data cp -a ${install_dir}.old/config ${install_dir} From 081c721336386b3947feffac666996978aa56054 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 11 Mar 2024 21:53:28 +0100 Subject: [PATCH 3/5] full_replace=1 --- scripts/upgrade | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f3942a4..f1c5dcc 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,18 +41,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1 if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." - # Move old app dir - mv ${install_dir} ${install_dir}.old -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 - -# restore data - cp -a ${install_dir}.old/config ${install_dir} - - # delete temp directory - ynh_secure_remove --file=${install_dir}.old -fi + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="$install_dir/config" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" From 0849031aba196e00554db8764d0d6414c6cd7eca Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:15:55 +0100 Subject: [PATCH 4/5] Update upgrade --- scripts/upgrade | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f1c5dcc..5d1616d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,13 +37,9 @@ ynh_npm install --global yarn # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 - -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="$install_dir/config" +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="$install_dir/config" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" From 186df1d939203d64d4992d04ce54fc75996d704b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:43:49 +0100 Subject: [PATCH 5/5] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5d1616d..d68c1ec 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,7 +39,7 @@ ynh_npm install --global yarn ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="$install_dir/config" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir"