From 3759154aca774ff2b6b2b80d321671380556b21c Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 20 Jan 2025 18:58:56 +0100 Subject: [PATCH] upgrade_client: Linux upgrade fixes --- npbackup/upgrade_client/upgrader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npbackup/upgrade_client/upgrader.py b/npbackup/upgrade_client/upgrader.py index 82f40af..988b3e1 100644 --- a/npbackup/upgrade_client/upgrader.py +++ b/npbackup/upgrade_client/upgrader.py @@ -297,14 +297,14 @@ def auto_upgrader( f'echo "Moving upgraded dist from {upgrade_dist} to {CURRENT_DIR}" >> "{log_file}" 2>&1 && ' f'mv -f "{upgrade_dist}" "{CURRENT_DIR}" >> "{log_file}" 2>&1 && ' f'echo "Copying optional configuration files from {backup_dist} to {CURRENT_DIR}" >> "{log_file}" 2>&1 && ' - rf'find "{backup_dist}" -name "*.conf" -exec cp --parents {{}} "{CURRENT_DIR}" \; ' + rf'find "{backup_dist}" -name "*.conf" -exec cp --parents {{}} "{CURRENT_DIR}" \; ;' f'echo "Adding executable bit to new executable" >> "{log_file}" 2>&1 && ' f'chmod +x "{CURRENT_EXECUTABLE}" >> "{log_file}" 2>&1 && ' f'echo "Loading new executable {CURRENT_EXECUTABLE} --version" >> "{log_file}" 2>&1 && ' f'"{CURRENT_EXECUTABLE}" --version >> "{log_file}" 2>&1; ' f"if [ $? -ne 0 ]; then " f'echo "New executable failed. Rolling back" >> "{log_file}" 2>&1 && ' - f'rm -f "{CURRENT_DIR}" >> "{log_file}" 2>&1 && ' + f'rm -rf "{CURRENT_DIR}" >> "{log_file}" 2>&1 && ' f'mv -f "{backup_dist}" "{CURRENT_DIR}" >> "{log_file}" 2>&1; ' f" else " f'echo "Upgrade successful" >> "{log_file}" 2>&1 && '