From f697cb4609b4950e9d5c994fec82458bbfe94f65 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Mon, 4 Mar 2024 19:26:24 -0800 Subject: [PATCH] Move update_wizard_windows.sh to update_wizard_windows.bat (oops) --- modules/extensions.py | 2 +- one_click.py | 5 +---- update_wizard_windows.sh => update_wizard_windows.bat | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename update_wizard_windows.sh => update_wizard_windows.bat (100%) diff --git a/modules/extensions.py b/modules/extensions.py index 69a977f2..6729b996 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -36,7 +36,7 @@ def load_extensions(): try: extension = importlib.import_module(f"extensions.{name}.script") except ModuleNotFoundError: - logger.error(f"Could not import the requirements for '{name}'. Make sure to install the requirements for the extension.\n\nLinux / Mac:\n\npip install -r extensions/{name}/requirements.txt --upgrade\n\nWindows:\n\npip install -r extensions\\{name}\\requirements.txt --upgrade\n\nIf you used the one-click installer, paste the command above in the terminal window opened after launching the cmd script for your OS.") + logger.error(f"Could not import the requirements for '{name}'. Make sure to install the requirements for the extension.\n\n* To install requirements for all available extensions, launch the\n update_wizard script for your OS and choose the B option.\n\n* To install the requirements for this extension alone, launch the\n cmd script for your OS and paste the following command in the\n terminal window that appears:\n\nLinux / Mac:\n\npip install -r extensions/{name}/requirements.txt --upgrade\n\nWindows:\n\npip install -r extensions\\{name}\\requirements.txt --upgrade\n") raise # Only run setup() and apply settings from settings.yaml once diff --git a/one_click.py b/one_click.py index 65b7acbd..65755a4f 100644 --- a/one_click.py +++ b/one_click.py @@ -259,7 +259,7 @@ def install_webui(): if "USE_CUDA118" in os.environ: use_cuda118 = "Y" if os.environ.get("USE_CUDA118", "").lower() in ("yes", "y", "true", "1", "t", "on") else "N" else: - print("\nDo you want to use CUDA 11.8 instead of 12.1? Only choose this option if your GPU is\nvery old (Kepler or older).\n\nFor RTX and GTX series GPUs, say \"N\".\nIf unsure, say \"N\".\n") + print("\nDo you want to use CUDA 11.8 instead of 12.1?\nOnly choose this option if your GPU is very old (Kepler or older).\n\nFor RTX and GTX series GPUs, say \"N\".\nIf unsure, say \"N\".\n") use_cuda118 = input("Input (Y/N)> ").upper().strip('"\'').strip() while use_cuda118 not in 'YN': print("Invalid choice. Please try again.") @@ -438,9 +438,6 @@ if __name__ == "__main__": install_webui() os.chdir(script_dir) - script_name = "update_wizard_windows.bat" if is_windows() else ("update_wizard_linux.sh" if is_linux() else "update_wizard_macos.sh") - print_big_message(f"The installation is finished.\n\nIf you wish to install or update extensions requirements, you can\nrun the following script at any time: {script_name}.") - if os.environ.get("LAUNCH_AFTER_INSTALL", "").lower() in ("no", "n", "false", "0", "f", "off"): print_big_message("Will now exit due to LAUNCH_AFTER_INSTALL.") sys.exit() diff --git a/update_wizard_windows.sh b/update_wizard_windows.bat similarity index 100% rename from update_wizard_windows.sh rename to update_wizard_windows.bat