From b89f689ea3b6e5850abcfe208001355d9f86173a Mon Sep 17 00:00:00 2001
From: Jens Frank <jf@S30.fritz.box>
Date: Tue, 14 Feb 2023 09:00:02 +0100
Subject: [PATCH] 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`