From 150a2380aaeec612bcf0f40f85a829fd4b487393 Mon Sep 17 00:00:00 2001 From: rodinux Date: Tue, 19 Sep 2023 22:14:39 +0200 Subject: [PATCH] fix how keep the file config.local.user.php on data folder path --- scripts/restore | 7 ++----- scripts/upgrade | 10 ++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/scripts/restore b/scripts/restore index cfd17f9..c42af40 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,11 +26,8 @@ find "$install_dir/data" -type d -exec chmod 770 {} + find "$install_dir/data" -type f -exec chmod 660 {} + chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" - -if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh8; then -chmod 660 "$install_dir/config.local.user.php" -else -chmod 660 "$install_dir/data/config.local.user.php" +if [[ -f "$install_dir/config.local.user.php" ]]; then + chmod 660 "$install_dir/config.local.user.php" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e10c8a6..439ad51 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,16 +38,14 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig tmp_data_backup=$(mktemp -d) rsync -a $install_dir/data/ $tmp_data_backup/ -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh1; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" - mv $install_dir/config.local.user.php $tmp_data_backup/ +if [[ -f "$install_dir/config.local.user.php" ]]; then + cp -a $install_dir/config.local.user.php $tmp_data_backup/ fi -if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh9; then - mv $install_dir/config.local.user.php $tmp_data_backup/ +if [[ $(grep "Garradin" $tmp_data_backup/config.local.user.php) ]] ; then + ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$tmp_data_backup/config.local.user.php" fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #=================================================