From 42a2bad9365ea2e7036d1859138ac1eca0a8d7af Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Wed, 20 Mar 2024 21:40:46 +1100 Subject: [PATCH] fix(installer): remove deleted scripts from launcher These scripts no longer exist and need to be removed from the launcher: - invokeai-ti - invokeai-merge - invokeai-model-install - invokeai-configure --- installer/templates/invoke.bat.in | 34 ++++-------------- installer/templates/invoke.sh.in | 57 ++++++------------------------- 2 files changed, 18 insertions(+), 73 deletions(-) diff --git a/installer/templates/invoke.bat.in b/installer/templates/invoke.bat.in index fb07280b6a..c949a01196 100644 --- a/installer/templates/invoke.bat.in +++ b/installer/templates/invoke.bat.in @@ -9,15 +9,10 @@ set INVOKEAI_ROOT=. :start echo Desired action: echo 1. Generate images with the browser-based interface -echo 2. Run textual inversion training -echo 3. Merge models (diffusers type only) -echo 4. Download and install models -echo 5. Change InvokeAI startup options -echo 6. Re-run the configure script to fix a broken install or to complete a major upgrade -echo 7. Open the developer console -echo 8. Update InvokeAI (DEPRECATED - please use the installer) -echo 9. Run the InvokeAI image database maintenance script -echo 10. Command-line help +echo 2. Open the developer console +echo 3. Update InvokeAI (DEPRECATED - please use the installer) +echo 4. Run the InvokeAI image database maintenance script +echo 5. Command-line help echo Q - Quit set /P choice="Please enter 1-10, Q: [1] " if not defined choice set choice=1 @@ -25,21 +20,6 @@ IF /I "%choice%" == "1" ( echo Starting the InvokeAI browser-based UI.. python .venv\Scripts\invokeai-web.exe %* ) ELSE IF /I "%choice%" == "2" ( - echo Starting textual inversion training.. - python .venv\Scripts\invokeai-ti.exe --gui -) ELSE IF /I "%choice%" == "3" ( - echo Starting model merging script.. - python .venv\Scripts\invokeai-merge.exe --gui -) ELSE IF /I "%choice%" == "4" ( - echo Running invokeai-model-install... - python .venv\Scripts\invokeai-model-install.exe -) ELSE IF /I "%choice%" == "5" ( - echo Running invokeai-configure... - python .venv\Scripts\invokeai-configure.exe --skip-sd-weight --skip-support-models -) ELSE IF /I "%choice%" == "6" ( - echo Running invokeai-configure... - python .venv\Scripts\invokeai-configure.exe --yes --skip-sd-weight -) ELSE IF /I "%choice%" == "7" ( echo Developer Console echo Python command is: where python @@ -51,15 +31,15 @@ IF /I "%choice%" == "1" ( echo ************************* echo *** Type `exit` to quit this shell and deactivate the Python virtual environment *** call cmd /k -) ELSE IF /I "%choice%" == "8" ( +) ELSE IF /I "%choice%" == "3" ( echo UPDATING FROM WITHIN THE APP IS BEING DEPRECATED. echo Please download the installer from https://github.com/invoke-ai/InvokeAI/releases/latest and run it to update your installation. timeout 4 python -m invokeai.frontend.install.invokeai_update -) ELSE IF /I "%choice%" == "9" ( +) ELSE IF /I "%choice%" == "4" ( echo Running the db maintenance script... python .venv\Scripts\invokeai-db-maintenance.exe -) ELSE IF /I "%choice%" == "10" ( +) ELSE IF /I "%choice%" == "5" ( echo Displaying command line help... python .venv\Scripts\invokeai-web.exe --help %* pause diff --git a/installer/templates/invoke.sh.in b/installer/templates/invoke.sh.in index a6bb88faec..f8d6014db6 100644 --- a/installer/templates/invoke.sh.in +++ b/installer/templates/invoke.sh.in @@ -58,49 +58,24 @@ do_choice() { invokeai-web $PARAMS ;; 2) - clear - printf "Textual inversion training\n" - invokeai-ti --gui $PARAMS - ;; - 3) - clear - printf "Merge models (diffusers type only)\n" - invokeai-merge --gui $PARAMS - ;; - 4) - clear - printf "Download and install models\n" - invokeai-model-install --root ${INVOKEAI_ROOT} - ;; - 5) - clear - printf "Change InvokeAI startup options\n" - invokeai-configure --root ${INVOKEAI_ROOT} --skip-sd-weights --skip-support-models - ;; - 6) - clear - printf "Re-run the configure script to fix a broken install or to complete a major upgrade\n" - invokeai-configure --root ${INVOKEAI_ROOT} --yes --default_only --skip-sd-weights - ;; - 7) clear printf "Open the developer console\n" file_name=$(basename "${BASH_SOURCE[0]}") bash --init-file "$file_name" ;; - 8) + 3) clear printf "UPDATING FROM WITHIN THE APP IS BEING DEPRECATED\n" printf "Please download the installer from https://github.com/invoke-ai/InvokeAI/releases/latest and run it to update your installation.\n" sleep 4 python -m invokeai.frontend.install.invokeai_update ;; - 9) + 4) clear printf "Running the db maintenance script\n" invokeai-db-maintenance --root ${INVOKEAI_ROOT} ;; - 10) + 5) clear printf "Command-line help\n" invokeai-web --help @@ -118,15 +93,10 @@ do_choice() { do_dialog() { options=( 1 "Generate images with a browser-based interface" - 2 "Textual inversion training" - 3 "Merge models (diffusers type only)" - 4 "Download and install models" - 5 "Change InvokeAI startup options" - 6 "Re-run the configure script to fix a broken install or to complete a major upgrade" - 7 "Open the developer console" - 8 "Update InvokeAI (DEPRECATED - please use the installer)" - 9 "Run the InvokeAI image database maintenance script" - 10 "Command-line help" + 2 "Open the developer console" + 3 "Update InvokeAI (DEPRECATED - please use the installer)" + 4 "Run the InvokeAI image database maintenance script" + 5 "Command-line help" ) choice=$(dialog --clear \ @@ -151,15 +121,10 @@ do_line_input() { printf " ** For a more attractive experience, please install the 'dialog' utility using your package manager. **\n\n" printf "What would you like to do?\n" printf "1: Generate images using the browser-based interface\n" - printf "2: Run textual inversion training\n" - printf "3: Merge models (diffusers type only)\n" - printf "4: Download and install models\n" - printf "5: Change InvokeAI startup options\n" - printf "6: Re-run the configure script to fix a broken install\n" - printf "7: Open the developer console\n" - printf "8: Update InvokeAI\n" - printf "9: Run the InvokeAI image database maintenance script\n" - printf "10: Command-line help\n" + printf "2: Open the developer console\n" + printf "3: Update InvokeAI\n" + printf "4: Run the InvokeAI image database maintenance script\n" + printf "5: Command-line help\n" printf "Q: Quit\n\n" read -p "Please enter 1-10, Q: [1] " yn choice=${yn:='1'}