From abbd02aa731871bce8ffa06116cdcd208237561f Mon Sep 17 00:00:00 2001 From: Arksine Date: Sun, 6 Dec 2020 07:28:11 -0500 Subject: [PATCH] scripts: minor fixes Run the legacy install cleanup after Klipper is detected in install-moonraker.sh Fix whitespace errros in uninstall-moonraker.sh Signed-ff-by: Eric Callahan --- scripts/install-moonraker.sh | 2 +- scripts/uninstall-moonraker.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install-moonraker.sh b/scripts/install-moonraker.sh index 571398b..ad3a661 100755 --- a/scripts/install-moonraker.sh +++ b/scripts/install-moonraker.sh @@ -132,8 +132,8 @@ done # Run installation steps defined above verify_ready -cleanup_legacy check_klipper +cleanup_legacy install_packages create_virtualenv install_script diff --git a/scripts/uninstall-moonraker.sh b/scripts/uninstall-moonraker.sh index 92507e7..e945435 100755 --- a/scripts/uninstall-moonraker.sh +++ b/scripts/uninstall-moonraker.sh @@ -25,7 +25,7 @@ remove_sudo_fix() { echo "#### Removing sudo_fix" sudo gpasswd -d $USER mnrkrsudo sudo delgroup --only-if-empty mnrkrsudo - sudo rm -f /etc/sudoers.d/020-sudo-for-moonraker + sudo rm -f /etc/sudoers.d/020-sudo-for-moonraker } remove_files() { @@ -69,4 +69,4 @@ verify_ready stop_service remove_service remove_files -remove_sudo_fix \ No newline at end of file +remove_sudo_fix