diff --git a/manifest.toml b/manifest.toml index 4793598..2c359fb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ code = "https://github.com/gchq/CyberChef" cpe = "cpe:2.3:a:gchq:cyberchef" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/change_url b/scripts/change_url index b69b5e5..803beb5 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -3,7 +3,7 @@ source _common.sh source /usr/share/yunohost/helpers -upstream_source_url=$(ynh_read_manifest +upstream_source_url=$(ynh_read_manifest) index_page=$(basename -s .zip $upstream_source_url).html #this variable will also populate the template tag __INDEX_PAGE__ in nginx.conf #================================================= diff --git a/scripts/install b/scripts/install index 855fefa..7f2d19b 100755 --- a/scripts/install +++ b/scripts/install @@ -3,7 +3,7 @@ source _common.sh source /usr/share/yunohost/helpers -upstream_source_url=$(ynh_read_manifest +upstream_source_url=$(ynh_read_manifest) source_filename=$(basename $upstream_source_url) index_page=$(basename -s .zip $upstream_source_url).html #this variable will also populate the template tag __INDEX_PAGE__ in nginx.conf @@ -17,7 +17,6 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" ynh_replace --match="$source_filename" --replace="$upstream_source_url" --file="$install_dir/$index_page" #replace link to local source file with link to upstream source file -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 68e80e9..37c5d8f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -11,7 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3502e87..0ab696f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,7 +3,7 @@ source _common.sh source /usr/share/yunohost/helpers -upstream_source_url=$(ynh_read_manifest +upstream_source_url=$(ynh_read_manifest) source_filename=$(basename $upstream_source_url) index_page=$(basename -s .zip $upstream_source_url).html #this variable will also populate the template tag __INDEX_PAGE__ in nginx.conf @@ -12,18 +12,11 @@ index_page=$(basename -s .zip $upstream_source_url).html #this variable will als #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression "Upgrading source files..." + +ynh_setup_source --dest_dir="$install_dir" --full_replace +ynh_replace --match="$source_filename" --replace="$upstream_source_url" --file="$install_dir/$index_page" #replace link to local source file with link to upstream source file -# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed -if ynh_app_upstream_version_changed -then - ynh_script_progression "Upgrading source files..." - ynh_setup_source --dest_dir="$install_dir" --full_replace - ynh_replace --match="$source_filename" --replace="$upstream_source_url" --file="$install_dir/$index_page" #replace link to local source file with link to upstream source file - - #REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" -fi - -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #=================================================