From 858301aa9a92ac001b1e93e9ea333c59f2f50822 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sat, 18 Mar 2023 18:15:11 +0100 Subject: [PATCH 1/2] fix: temporary disable backup_before_update Signed-off-by: Dominik Willner --- scripts/backup.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/backup.sh b/scripts/backup.sh index dc51d22..e918e22 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -25,10 +25,12 @@ function check_for_backup_dir() { } function backup_before_update() { - read_kiauh_ini "${FUNCNAME[0]}" - local state="${backup_before_update}" - [[ ${state} = "false" ]] && return - backup_"${1}" + echo "" + ### todo backup functions need to be updated for new folder structure +# read_kiauh_ini "${FUNCNAME[0]}" +# local state="${backup_before_update}" +# [[ ${state} = "false" ]] && return +# backup_"${1}" } function backup_klipper_config_dir() { -- 2.39.5 From d16a2f26fd66538db34f7d1396015305b562a43b Mon Sep 17 00:00:00 2001 From: Piotr Banasik Date: Sat, 18 Mar 2023 10:53:40 -0700 Subject: [PATCH 2/2] Override the BASE_USER for crowsnest install to the current user The crowsnest installer used `logname` to figure out the current user, this isn't great since it will return the "original" owner of the login session, so if you used `sudo` or `su` to become your klipper user .. it would try to install things into your original user making a bit of a mess ... --- scripts/crowsnest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/crowsnest.sh b/scripts/crowsnest.sh index ef123cc..cda3820 100644 --- a/scripts/crowsnest.sh +++ b/scripts/crowsnest.sh @@ -105,7 +105,7 @@ function install_crowsnest(){ pushd "${HOME}/crowsnest" &> /dev/null || exit 1 title_msg "Installer will prompt you for sudo password!" status_msg "Launching crowsnest installer ..." - if ! sudo make install; then + if ! sudo make install BASE_USER=$USER; then error_msg "Something went wrong! Please try again..." exit 1 fi -- 2.39.5