From 87c9df5c0de6c635695f881cb8f0fa6e1ea42ede Mon Sep 17 00:00:00 2001 From: JeLuF Date: Mon, 18 Sep 2023 18:55:34 +0200 Subject: [PATCH] Remove old plugin file --- scripts/on_sd_start.bat | 1 + scripts/on_sd_start.sh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index ccbb97fe..51668fbd 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -34,6 +34,7 @@ call conda activate @REM remove the old version of the dev console script, if it's still present if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" +if exist "ui\plugins\ui\merge.plugin.js" del "ui\plugins\ui\merge.plugin.js" @rem create the stable-diffusion folder, to work with legacy installations if not exist "stable-diffusion" mkdir stable-diffusion diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 48161cd3..fbd39f8c 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -6,6 +6,7 @@ cp sd-ui-files/scripts/bootstrap.sh scripts/ cp sd-ui-files/scripts/check_modules.py scripts/ cp sd-ui-files/scripts/get_config.py scripts/ cp sd-ui-files/scripts/config.yaml.sample scripts/ + source ./scripts/functions.sh @@ -20,6 +21,10 @@ if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" fi +if [ -e "ui/plugins/ui/merge.plugin.js" ]; then + rm "ui/plugins/ui/merge.plugin.js" +fi + # set the correct installer path (current vs legacy) if [ -e "installer_files/env" ]; then export INSTALL_ENV_DIR="$(pwd)/installer_files/env"