From d9060fed3b43b626d43316640f366a164ec11be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Thu, 9 May 2024 12:26:43 +0200 Subject: [PATCH] cleaning old Shake&Tune venv and configs --- install.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index bf280b8..7d59e13 100755 --- a/install.sh +++ b/install.sh @@ -5,6 +5,7 @@ MOONRAKER_CONFIG="${HOME}/printer_data/config/moonraker.conf" KLIPPER_PATH="${HOME}/klipper" KLIPPER_VENV_PATH="${HOME}/klippy-env" +OLD_K_SHAKETUNE_VENV="${HOME}/klippain_shaketune-env" K_SHAKETUNE_PATH="${HOME}/klippain_shaketune" set -eu @@ -81,6 +82,11 @@ function setup_venv { exit -1 fi + if [ -d "${OLD_K_SHAKETUNE_VENV}" ]; then + echo "[INFO] Old K-Shake&Tune virtual environement found, cleaning it!" + rm -rf "${OLD_K_SHAKETUNE_VENV}" + fi + source "${KLIPPER_VENV_PATH}/bin/activate" echo "[SETUP] Installing/Updating K-Shake&Tune dependencies..." pip install --upgrade pip @@ -90,14 +96,18 @@ function setup_venv { } function link_extension { - echo "[INSTALL] Linking scripts to your config directory..." + # Reusing the old linking extension function to cleanup and remove the macros for older S&T versions if [ -d "${HOME}/klippain_config" ] && [ -f "${USER_CONFIG_PATH}/.VERSION" ]; then - echo "[INSTALL] Klippain full installation found! Linking module to the script folder of Klippain" - ln -frsn ${K_SHAKETUNE_PATH}/K-ShakeTune ${USER_CONFIG_PATH}/scripts/K-ShakeTune + if [ -d "${USER_CONFIG_PATH}/scripts/K-ShakeTune" ]; then + echo "[INFO] Old K-Shake&Tune macro folder found, cleaning it!" + rm -d "${USER_CONFIG_PATH}/scripts/K-ShakeTune" + fi else - echo "[INSTALL] Klippain not found! Linking module to the config folder of Klipper" - ln -frsn ${K_SHAKETUNE_PATH}/K-ShakeTune ${USER_CONFIG_PATH}/K-ShakeTune + if [ -d "${USER_CONFIG_PATH}/K-ShakeTune" ]; then + echo "[INFO] Old K-Shake&Tune macro folder found, cleaning it!" + rm -d "${USER_CONFIG_PATH}/K-ShakeTune" + fi fi }