From 5ad6429800dbfe18782804d7ac9020f790c05f26 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 15 May 2021 13:15:33 +0200 Subject: [PATCH] Fix --- check_process | 6 +++--- scripts/upgrade | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/check_process b/check_process index 5d9cb97..55c2ed8 100644 --- a/check_process +++ b/check_process @@ -5,9 +5,9 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/path" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/scripts/upgrade b/scripts/upgrade index e42da95..e4aa069 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,12 +85,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=4 - # Create a temporary directory - tmpdir="$(mktemp -d)" - - # Backup the config file in the temp dir - cp -a "$final_path/public/dist/user.css" "$tmpdir/user.css" - if [ "$version" -lt "4.3" ]; then mkdir -p $public_path/uploads # Move media to new path @@ -101,13 +95,7 @@ then ynh_secure_remove --file="$final_path" # 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/user.css" "$final_path/public/dist/user.css" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/public/dist/user.css" fi #=================================================