From 2817f8a428efe4dbe7bad0ff0fc22e0bf00e3237 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Thu, 26 Jan 2023 15:26:38 -0500 Subject: [PATCH] update launcher shell scripts for new script names & paths --- installer/templates/invoke.bat.in | 18 +++++++++--------- installer/templates/invoke.sh.in | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/installer/templates/invoke.bat.in b/installer/templates/invoke.bat.in index 4b2e982d13..6e5dfa2a55 100644 --- a/installer/templates/invoke.bat.in +++ b/installer/templates/invoke.bat.in @@ -11,23 +11,26 @@ echo 1. command-line echo 2. browser-based UI echo 3. run textual inversion training echo 4. merge models (diffusers type only) -echo 5. open the developer console -echo 6. re-run the configure script to download new models +echo 5. re-run the configure script to download new models +echo 6. open the developer console set /P restore="Please enter 1, 2, 3, 4 or 5: [5] " if not defined restore set restore=2 IF /I "%restore%" == "1" ( echo Starting the InvokeAI command-line.. - python .venv\Scripts\invoke.py %* + python .venv\Scripts\invoke %* ) ELSE IF /I "%restore%" == "2" ( echo Starting the InvokeAI browser-based UI.. - python .venv\Scripts\invoke.py --web %* + python .venv\Scripts\invoke --web %* ) ELSE IF /I "%restore%" == "3" ( echo Starting textual inversion training.. - python .venv\Scripts\textual_inversion_fe.py --web %* + python .venv\Scripts\textual_inversion --gui %* ) ELSE IF /I "%restore%" == "4" ( echo Starting model merging script.. - python .venv\Scripts\merge_models_fe.py --web %* + python .venv\Scripts\merge_models --gui %* ) ELSE IF /I "%restore%" == "5" ( + echo Running configure_invokeai.py... + python .venv\Scripts\configure_invokeai %* +) ELSE IF /I "%restore%" == "6" ( echo Developer Console echo Python command is: where python @@ -39,9 +42,6 @@ IF /I "%restore%" == "1" ( echo ************************* echo *** Type `exit` to quit this shell and deactivate the Python virtual environment *** call cmd /k -) ELSE IF /I "%restore%" == "6" ( - echo Running configure_invokeai.py... - python .venv\Scripts\configure_invokeai.py --web %* ) ELSE ( echo Invalid selection pause diff --git a/installer/templates/invoke.sh.in b/installer/templates/invoke.sh.in index d871bb7e58..5ec2e195ca 100644 --- a/installer/templates/invoke.sh.in +++ b/installer/templates/invoke.sh.in @@ -21,17 +21,17 @@ if [ "$0" != "bash" ]; then echo "2. browser-based UI" echo "3. run textual inversion training" echo "4. merge models (diffusers type only)" - echo "5. re-run the configure script to download new models" - echo "6. open the developer console" + echo "5. open the developer console" + echo "6. re-run the configure script to download new models" read -p "Please enter 1, 2, 3, 4 or 5: [1] " yn choice=${yn:='2'} case $choice in - 1 ) printf "\nStarting the InvokeAI command-line..\n"; .venv/bin/python .venv/bin/invoke.py $*;; - 2 ) printf "\nStarting the InvokeAI browser-based UI..\n"; .venv/bin/python .venv/bin/invoke.py --web $*;; - 3 ) printf "\nStarting Textual Inversion:\n"; .venv/bin/python .venv/bin/textual_inversion_fe.py $*;; - 4 ) printf "\nMerging Models:\n"; .venv/bin/python .venv/bin/merge_models_fe.py $*;; + 1 ) printf "\nStarting the InvokeAI command-line..\n"; invoke $*;; + 2 ) printf "\nStarting the InvokeAI browser-based UI..\n"; invoke --web $*;; + 3 ) printf "\nStarting Textual Inversion:\n"; textual_inversion --gui $*;; + 4 ) printf "\nMerging Models:\n"; merge_models --gui $*;; 5 ) printf "\nDeveloper Console:\n"; file_name=$(basename "${BASH_SOURCE[0]}"); bash --init-file "$file_name";; - 6 ) printf "\nRunning configure_invokeai.py:\n"; .venv/bin/python .venv/bin/configure_invokeai.py $*;; + 6 ) printf "\nRunning configure_invokeai.py:\n"; configure_invokeai $*;; * ) echo "Invalid selection"; exit;; esac else # in developer console