Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

stability and use improvements to binary & source installers

Browse Source 
- Pass command-line arguments through to invoke.py via the .bat and .sh scripts.
- Remove obsolete warning message from binary install.bat
- Make sure that current working directory matches where .bat file is installed
This commit is contained in:
Lincoln Stein 2022-12-03 18:39:26 +00:00
parent 0111304982
commit 38cd968130
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binary_installer/install.bat.in
View File

@ -19,7 +19,6 @@ if "%1" == "use-cache" (
) )
echo ***** Installing InvokeAI.. ***** echo ***** Installing InvokeAI.. *****
echo "USING development BRANCH. REMEMBER TO CHANGE TO main BEFORE RELEASE"
@rem Config @rem Config
set INSTALL_ENV_DIR=%cd%\installer_files\env set INSTALL_ENV_DIR=%cd%\installer_files\env
@rem https://mamba.readthedocs.io/en/latest/installation.html @rem https://mamba.readthedocs.io/en/latest/installation.html

5
binary_installer/invoke.bat.in
View File

@ -1,5 +1,6 @@
@echo off @echo off
PUSHD "%~dp0"
call .venv\Scripts\activate.bat call .venv\Scripts\activate.bat
echo Do you want to generate images using the echo Do you want to generate images using the
@ -10,10 +11,10 @@ echo 3. open the developer console
set /p choice="Please enter 1, 2 or 3: " set /p choice="Please enter 1, 2 or 3: "
if /i "%choice%" == "1" ( if /i "%choice%" == "1" (
echo Starting the InvokeAI command-line. echo Starting the InvokeAI command-line.
.venv\Scripts\python scripts\invoke.py .venv\Scripts\python scripts\invoke.py %*
) else if /i "%choice%" == "2" ( ) else if /i "%choice%" == "2" (
echo Starting the InvokeAI browser-based UI. echo Starting the InvokeAI browser-based UI.
.venv\Scripts\python scripts\invoke.py --web .venv\Scripts\python scripts\invoke.py --web %*
) else if /i "%choice%" == "3" ( ) else if /i "%choice%" == "3" (
echo Developer Console echo Developer Console
echo Python command is: echo Python command is:

4
binary_installer/invoke.sh.in
View File

@ -20,11 +20,11 @@ read choice
case $choice in case $choice in
1) 1)
printf "\nStarting the InvokeAI command-line..\n"; printf "\nStarting the InvokeAI command-line..\n";
.venv/bin/python scripts/invoke.py; .venv/bin/python scripts/invoke.py $*;
;; ;;
2) 2)
printf "\nStarting the InvokeAI browser-based UI..\n"; printf "\nStarting the InvokeAI browser-based UI..\n";
.venv/bin/python scripts/invoke.py --web; .venv/bin/python scripts/invoke.py --web $*;
;; ;;
3) 3)
printf "\nDeveloper Console:\n"; printf "\nDeveloper Console:\n";

5
source_installer/invoke.bat.in
View File

@ -1,5 +1,6 @@
@echo off @echo off
PUSHD "%~dp0"
set INSTALL_ENV_DIR=%cd%\installer_files\env set INSTALL_ENV_DIR=%cd%\installer_files\env
set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH% set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH%
@ -12,10 +13,10 @@ echo 3. open the developer console
set /P restore="Please enter 1, 2 or 3: " set /P restore="Please enter 1, 2 or 3: "
IF /I "%restore%" == "1" ( IF /I "%restore%" == "1" (
echo Starting the InvokeAI command-line.. echo Starting the InvokeAI command-line..
python scripts\invoke.py python scripts\invoke.py %*
) ELSE IF /I "%restore%" == "2" ( ) ELSE IF /I "%restore%" == "2" (
echo Starting the InvokeAI browser-based UI.. echo Starting the InvokeAI browser-based UI..
python scripts\invoke.py --web python scripts\invoke.py --web %*
) ELSE IF /I "%restore%" == "3" ( ) ELSE IF /I "%restore%" == "3" (
echo Developer Console echo Developer Console
call where python call where python

4
source_installer/invoke.sh.in
View File

@ -22,8 +22,8 @@ if [ "$0" != "bash" ]; then
echo "3. open the developer console" echo "3. open the developer console"
read -p "Please enter 1, 2, or 3: " yn read -p "Please enter 1, 2, or 3: " yn
case $yn in case $yn in
1 ) printf "\nStarting the InvokeAI command-line..\n"; python scripts/invoke.py;; 1 ) printf "\nStarting the InvokeAI command-line..\n"; python scripts/invoke.py $*;;
2 ) printf "\nStarting the InvokeAI browser-based UI..\n"; python scripts/invoke.py --web;; 2 ) printf "\nStarting the InvokeAI browser-based UI..\n"; python scripts/invoke.py --web $*;;
3 ) printf "\nDeveloper Console:\n"; file_name=$(basename "${BASH_SOURCE[0]}"); bash --init-file "$file_name";; 3 ) printf "\nDeveloper Console:\n"; file_name=$(basename "${BASH_SOURCE[0]}"); bash --init-file "$file_name";;
* ) echo "Invalid selection"; exit;; * ) echo "Invalid selection"; exit;;
esac esac