From 1b1bdbfd8237d9a12da3cd25a07448f3ca160178 Mon Sep 17 00:00:00 2001 From: Rafi594 Date: Wed, 23 Oct 2019 14:58:46 +0200 Subject: [PATCH] Fixed upgrade --- check_process | 2 +- scripts/upgrade | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index b05c831..4fc0316 100644 --- a/check_process +++ b/check_process @@ -25,7 +25,7 @@ multi_instance=1 incorrect_path=0 port_already_use=1 - change_url=0 + change_url=1 ;;; Levels # If the level 5 (Package linter) is forced to 1. Please add justifications here. diff --git a/scripts/upgrade b/scripts/upgrade index 0e22561..2cf195f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,8 +118,6 @@ mkdir -p /home/yunohost.app/$app/.minetest/ mkdir /home/yunohost.app/$app/.minetest/worlds/ fi -cp -a ../conf/minetest.conf /home/yunohost.app/$app/.minetest/ - #================================================= # SPECIFIC UPGRADE #================================================= @@ -134,16 +132,15 @@ make -j$(nproc) popd -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. -ynh_backup_if_checksum_is_different --file="$home_path/.minetest/minetest.conf" -# Recalculate and store the checksum of the file for the next upgrade. -ynh_store_file_checksum --file="$home_path/.minetest/minetest.conf" #================================================= # MODIFY A CONFIG FILE #================================================= +ynh_backup_if_checksum_is_different --file="$home_path/.minetest/minetest.conf" + +cp ../conf/minetest.conf $home/.minetest/minetest.conf + ### `ynh_replace_string` is used to replace a string in a file. ### (It's compatible with sed regular expressions syntax) @@ -156,6 +153,8 @@ ynh_replace_string --match_string="__PVP__" --replace_string="$pvp" --target_fil ynh_replace_string --match_string="__CREATIVE__" --replace_string="$creative" --target_file="$home_path/.minetest/minetest.conf" ynh_replace_string --match_string="__DAMAGE__" --replace_string="$damage" --target_file="$home_path/.minetest/minetest.conf" +ynh_store_file_checksum --file="$home_path/.minetest/minetest.conf" + #================================================= # SETUP LOGROTATE #=================================================