diff --git a/check_process b/check_process index 1d03636..4e761c5 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,6 @@ setup_private=1 setup_public=1 upgrade=1 - #3.24.0 - upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 #4.0.0 upgrade=1 from_commit=4b43c2fd8731a9d08196c4d1b688922ff6b39f00 #4.1.0 @@ -29,8 +27,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 - name=update to 3.24.0 ; commit=4b43c2fd8731a9d08196c4d1b688922ff6b39f00 name=update to 4.0.0 ; commit=b0dd9be98e3cfedec24d3910058682b36e3fedda diff --git a/manifest.json b/manifest.json index 5c02f3f..8b2fb9f 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "url": "https://frju365.yunohost.support" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": false, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index 8eb6fe1..95ae3a1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,20 +87,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Create a temporary directory - tmpdir="$(mktemp -d)" - - # Backup the config file in the temp dir - cp -a "$final_path/config/config.js" "$tmpdir/config.js" - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" - - # Copy the admin saved settings from tmp directory to final path - cp -a "$tmpdir/config.js" "$final_path/config/config.js" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.js" fi #=================================================