From da1c501cf7a9c1d7ce13ff1184cac575b5f17363 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Mon, 20 Mar 2023 11:01:07 -0400 Subject: [PATCH] Move old setup/error logs before any logs are written on a subsequent setup invocation --- setup/so-setup | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 814fc6e79..5356965aa 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -58,6 +58,10 @@ while [[ $# -gt 0 ]]; do esac done +# Preserve old setup/error logs +[ -f "$error_log" ] && mv "$error_log" "$error_log.$(+%Y-%m-%dT%H:%M:%S)" +[ -f "$setup_log" ] && mv "$setup_log" "$setup_log.$(+%Y-%m-%dT%H:%M:%S)" + # Let's see what OS we are dealing with here detect_os @@ -134,9 +138,7 @@ title "Checking to see if install has run before" if [[ -f /root/accept_changes ]]; then is_reinstall=true whiptail_reinstall - info "Old setup detected. Moving the last setup.log to setup.log.bak" - mv "$setup_log" "$setup_log.bak" - [ -f "$error_log" ] && mv "$error_log" "$error_log.bak" + info "Old setup detected. Preparing for reinstallation." reinstall_init reset_proxy fi @@ -267,7 +269,7 @@ if ! [[ -f $install_opt_file ]]; then if (whiptail_you_sure); then true else - error "User cancelled setup." + info "User cancelled setup." whiptail_cancel fi # If this is an analyst install lets streamline the process.