From b89f689ea3b6e5850abcfe208001355d9f86173a Mon Sep 17 00:00:00 2001 From: Jens Frank Date: Tue, 14 Feb 2023 09:00:02 +0100 Subject: [PATCH 1/2] Fix functions.sh upgrade, change messages to Easy Diffusion --- scripts/on_env_start.sh | 6 +++--- scripts/on_sd_start.sh | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/on_env_start.sh b/scripts/on_env_start.sh index 52d0b62f..7e180f02 100755 --- a/scripts/on_env_start.sh +++ b/scripts/on_env_start.sh @@ -2,7 +2,7 @@ source ./scripts/functions.sh -printf "\n\nStable Diffusion UI\n\n" +printf "\n\nEasy Diffusion\n\n" if [ -f "scripts/config.sh" ]; then source scripts/config.sh @@ -13,7 +13,7 @@ if [ "$update_branch" == "" ]; then fi if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/install_status.txt` -gt "0" ]; then - echo "Stable Diffusion UI's git repository was already installed. Updating from $update_branch.." + echo "Easy Diffusion's git repository was already installed. Updating from $update_branch.." cd sd-ui-files @@ -23,7 +23,7 @@ if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/in cd .. else - printf "\n\nDownloading Stable Diffusion UI..\n\n" + printf "\n\nDownloading Easy Diffusion..\n\n" printf "Using the $update_branch channel\n\n" if git clone -b "$update_branch" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files ; then diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 8f206071..11d62531 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -1,11 +1,12 @@ #!/bin/bash -source ./scripts/functions.sh - +cp sd-ui-files/scripts/functions.sh scripts/ cp sd-ui-files/scripts/on_env_start.sh scripts/ cp sd-ui-files/scripts/bootstrap.sh scripts/ cp sd-ui-files/scripts/check_modules.py scripts/ +source ./scripts/functions.sh + # activate the installer env CONDA_BASEPATH=$(conda info --base) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error @@ -118,9 +119,9 @@ else fi if python ../scripts/check_modules.py uvicorn fastapi ; then - echo "Packages necessary for Stable Diffusion UI were already installed" + echo "Packages necessary for Easy Diffusion were already installed" else - printf "\n\nDownloading packages necessary for Stable Diffusion UI..\n\n" + printf "\n\nDownloading packages necessary for Easy Diffusion..\n\n" export PYTHONNOUSERSITE=1 export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages" @@ -280,7 +281,7 @@ if [ `grep -c sd_install_complete ../scripts/install_status.txt` -gt "0" ]; then echo sd_install_complete >> ../scripts/install_status.txt fi -printf "\n\nStable Diffusion is ready!\n\n" +printf "\n\nEasy Diffusion installation complete, starting the server!\n\n" SD_PATH=`pwd` From 2df4286256007d1ee16b8c9a0981910e385843f0 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Tue, 14 Feb 2023 09:05:23 +0100 Subject: [PATCH 2/2] Change SDUI to Easy Diffusion --- scripts/on_env_start.bat | 8 ++++---- scripts/on_sd_start.bat | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 13d54161..5bc1885d 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -1,6 +1,6 @@ @echo off -@echo. & echo "Stable Diffusion UI - v2" & echo. +@echo. & echo "Easy Diffusion - v2" & echo. set PATH=C:\Windows\System32;%PATH% @@ -28,7 +28,7 @@ if "%update_branch%"=="" ( @>nul findstr /m "sd_ui_git_cloned" scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( - @echo "Stable Diffusion UI's git repository was already installed. Updating from %update_branch%.." + @echo "Easy Diffusion's git repository was already installed. Updating from %update_branch%.." @cd sd-ui-files @@ -38,13 +38,13 @@ if "%update_branch%"=="" ( @cd .. ) else ( - @echo. & echo "Downloading Stable Diffusion UI.." & echo. + @echo. & echo "Downloading Easy Diffusion..." & echo. @echo "Using the %update_branch% channel" & echo. @call git clone -b "%update_branch%" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files && ( @echo sd_ui_git_cloned >> scripts\install_status.txt ) || ( - @echo "Error downloading Stable Diffusion UI. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" + @echo "Error downloading Easy Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" pause @exit /b ) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index ee7b9ab8..821e24aa 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -26,7 +26,7 @@ if exist "%cd%\stable-diffusion\env" ( @rem activate the installer env call conda activate @if "%ERRORLEVEL%" NEQ "0" ( - @echo. & echo "Error activating conda for Stable Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo. + @echo. & echo "Error activating conda for Easy Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo. pause exit /b ) @@ -139,15 +139,15 @@ set PATH=C:\Windows\System32;%PATH% call python ..\scripts\check_modules.py uvicorn fastapi @if "%ERRORLEVEL%" EQU "0" ( - echo "Packages necessary for Stable Diffusion UI were already installed" + echo "Packages necessary for Easy Diffusion were already installed" ) else ( - @echo. & echo "Downloading packages necessary for Stable Diffusion UI.." & echo. + @echo. & echo "Downloading packages necessary for Easy Diffusion..." & echo. set PYTHONNOUSERSITE=1 set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages @call conda install -c conda-forge -y uvicorn fastapi || ( - echo "Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" + echo "Error installing the packages necessary for Easy Diffusion. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" pause exit /b ) @@ -328,7 +328,7 @@ call WHERE uvicorn > .tmp @echo sd_install_complete >> ..\scripts\install_status.txt ) -@echo. & echo "Stable Diffusion is ready!" & echo. +@echo. & echo "Easy Diffusion installation complete! Starting the server!" & echo. @set SD_DIR=%cd%