From abe84fc59f69d1ba996f653934f3ba89d815b8bb Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 29 Jul 2023 15:00:56 +0200 Subject: [PATCH 1/2] tweak nginx conf for X-script-Name --- scripts/change_url | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 5195dab..6599a65 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,11 @@ ynh_systemd_action --service_name=$app --action="stop" # MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 +#Cannot use empty string for X-script-name, causes an issue in the python prg +if [ $path_url = "/" ] ; then + ynh_replace_string " proxy_set_header X-Script-Name" "# proxy_set_header X-Script-Name" ../conf/nginx.conf +fi + ynh_change_url_nginx_config #================================================= From a6aeecc38ac941e852205db13c62511ba39bbc44 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 29 Jul 2023 17:06:22 +0200 Subject: [PATCH 2/2] current version and package --- scripts/upgrade | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index fb4a585..9302be3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,16 +31,12 @@ upgrade_type=$(ynh_check_app_version_changed) current_upstream_package_version=$(ynh_app_upstream_version --manifest="/etc/yunohost/apps/$app/manifest.json") #0.96.0 current_upstream_package_version="${current_upstream_package_version/".96"/".6"}" #0.6.0 -new_upstream_package_version=$(ynh_app_upstream_version) #0.96.0 +new_upstream_package_version=$(ynh_app_upstream_version) new_upstream_package_version="${new_upstream_package_version/".96"/".6"}" #0.6.0 -#if [ -f $install_dir/cps/constants.py ]; then #on est dans une version postérieur à la 0.6.0 -# current_upstream_app_version=$(cat $install_dir/cps/constants.py | grep STABLE_VERSION) -# current_upstream_app_version="${current_upstream_app_version/STABLE_VERSION = \{\'version\': \'/""}" -# current_upstream_app_version="${current_upstream_app_version/\'\}/""}" -#else #on est encore en 0.6.0 -# current_upstream_app_version='0.6.0' -#fi +current_upstream_app_version=$(cat $install_dir/cps/constants.py | grep STABLE_VERSION) +current_upstream_app_version="${current_upstream_app_version/STABLE_VERSION = \{\'version\': \'/""}" +current_upstream_app_version="${current_upstream_app_version/\'\}/""}" #=================================================