Revert "Merge pull request #294 from cmdr2/main"

This reverts commit 1e3b4f9969, reversing changes made to e0c0935d3a.
Merge pull request #294 from cmdr2/main
2025-08-14 10:15:31 +02:00 · 2022-10-07 20:07:15 +05:30 · 2022-10-07 20:03:01 +05:30
583 changed files with 20051 additions and 6751 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+* text=auto eol=lf
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,10 @@ __pycache__
 installer
 installer.tar
 dist
+
+# built code for the front end
+!/ui/frontend/dist
+ui/frontend/.idea/*
+ui/frontend/build_src/.idea/*
+
 .idea/*
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -13,11 +13,12 @@ If you would like to contribute to this project, there is a discord for dicussio
 This is in-flux, but one way to get a development environment running for editing the UI of this project is:
 (swap `.sh` or `.bat` in instructions depending on your environment, and be sure to adjust any paths to match where you're working)

-1) Install the project to a new location using the [usual installation process](https://github.com/cmdr2/stable-diffusion-ui#installation), e.g. to `/projects/stable-diffusion-ui-archive`
-2) Start the newly installed project, and check that you can view and generate images on `localhost:9000`
-3) Next, please clone the project repository using `git clone` (e.g. to `/projects/stable-diffusion-ui-repo`)
-4) Close the server (started in step 2), and edit `/projects/stable-diffusion-ui-archive/scripts/on_env_start.sh` (or `on_env_start.bat`)
-5) Comment out the lines near the bottom that copies the `files/ui` folder, e.g:
+1) `git clone` the repository, e.g. to `/projects/stable-diffusion-ui-repo`
+2) Download the pre-built end user archive from the link on github, and extract it, e.g. to `/projects/stable-diffusion-ui-archive`
+3) `cd /projects/stable-diffusion-ui-archive` and run the script to set up and start the project, e.g. `start.sh`
+4) Check you can view and generate images on `localhost:9000`
+5) Close the server, and edit `/projects/stable-diffusion-ui-archive/scripts/on_env_start.sh`
+6) Comment out the lines near the bottom that copies the `files/ui` folder, e.g:
  
  for `.sh`
 ```
@ -32,13 +33,13 @@ REM @xcopy sd-ui-files\ui ui /s /i /Y
 REM @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
 REM @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
 ``` 
-6) Next, comment out the line at the top of `/projects/stable-diffusion-ui-archive/scripts/on_sd_start.sh` (or `on_sd_start.bat`) that copies `on_env_start`. For e.g. `@rem @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y`
+7) Comment out the line at the top of `/projects/stable-diffusion-ui-archive/scripts/on_sd_start.sh` that copies `on_env_start`. For e.g. `@copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y`
 8) Delete the current `ui` folder at `/projects/stable-diffusion-ui-archive/ui`
 9) Now make a symlink between the repository clone (where you will be making changes) and this archive (where you will be running stable diffusion):
 `ln -s /projects/stable-diffusion-ui-repo/ui /projects/stable-diffusion-ui-archive/ui`
 or for Windows
-`mklink /J \projects\stable-diffusion-ui-archive\ui \projects\stable-diffusion-ui-repo\ui` (link name first, source repo dir second)
-9) Run the project again (like in step 2) and ensure you can still use the UI.
+`mklink /D \projects\stable-diffusion-ui-archive\ui \projects\stable-diffusion-ui-repo\ui` (link name first, source repo dir second)
+9) Run the archive again `start.sh` and ensure you can still use the UI.
 10) Congrats, now any changes you make in your repo `ui` folder are linked to this running archive of the app and can be previewed in the browser.

 Check the `ui/frontend/build/README.md` for instructions on running and building the React code.
@ -46,5 +47,9 @@ Check the `ui/frontend/build/README.md` for instructions on running and building
 ## Development environment for Installer changes
 Build the Windows installer using Windows, and the Linux installer using Linux. Don't mix the two, and don't use WSL. An Ubuntu VM is fine for building the Linux installer on a Windows host.

-1. Run `build.bat` or `./build.sh` depending on whether you're in Windows or Linux.
-2. Make a new GitHub release and upload the Windows and Linux installer builds created inside the `dist` folder.
+1. Install Miniconda 3 or Anaconda.
+2. Install `conda install -c conda-forge -y conda-pack`
+3. Open the Anaconda Prompt. Do not use WSL if you're building for Windows.
+4. Run `build.bat` or `./build.sh` depending on whether you're in Windows or Linux.
+5. Compress the `stable-diffusion-ui` folder created inside the `dist` folder. Make a `zip` for Windows, and `tar.xz` for Linux (smaller files, and Linux users already have tar).
+6. Make a new GitHub release and upload the Windows and Linux installer builds.
--- a/README.md
+++ b/README.md
@ -1,77 +1,48 @@
-# Stable Diffusion UI
-### Easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. No dependencies or technical knowledge required. 1-click install, powerful features.
-
-[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)
-
----
-
-## Step 1: Download the installer
+# Stable Diffusion UI v2
+### A simple 1-click way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. No dependencies or technical knowledge required.

 <p float="left">
  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-win.png" width="200" /></a>
  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-linux.png" width="200" /></a>
 </p>

-## Step 2: Run the program
- On Windows: Double-click `Start Stable Diffusion UI.cmd`
- On Linux: Run `./start.sh` in a terminal
+[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)

-## Step 3: There is no step 3!
-It's simple to get started. You don't need to install or struggle with Python, Anaconda, Docker etc.
+️‍🔥🎉 **New!** Task Queue, Negative Prompt, Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!

-The installer will take care of whatever is needed. A friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) will help you if you face any problems.
+This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 becomes publicly available, the model in this distribution will be updated.

----
-
-# Easy for new users, powerful features for advanced users
-### Features:
+# Features in the new v2 Version:
 - **No Dependencies or Technical Knowledge Required**: 1-click install for Windows 10/11 and Linux. *No dependencies*, no need for WSL or Docker or Conda or technical setup. Just download and run!
- **Clutter-free UI**: a friendly and simple UI, while providing a lot of powerful features
- Supports "*Text to Image*" and "*Image to Image*"
- **Custom Models**: Use your own `.ckpt` file, by placing it inside the `models/stable-diffusion` folder!
+- **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
+- **In-Painting**
 - **Live Preview**: See the image as the AI is drawing it
 - **Task Queue**: Queue up all your ideas, without waiting for the current task to finish
- **In-Painting**: Specify areas of your image to paint into
- **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
- **Loopback**: Use the output image as the input image for the next img2img task
 - **Negative Prompt**: Specify aspects of the image to *remove*.
- **Attention/Emphasis:** () in the prompt increases the model's attention to enclosed words, and [] decreases it
- **Weighted Prompts:** Use weights for specific words in your prompt to change their importance, e.g. `red:2.4 dragon:1.2`
- **Prompt Matrix:** (in beta) Quickly create multiple variations of your prompt, e.g. `a photograph of an astronaut riding a horse | illustration | cinematic lighting`
 - **Lots of Samplers:** ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms
- **Multiple Prompts File:** Queue multiple prompts by entering one prompt per line, or by running a text file
+- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
+- **New UI**: with cleaner design
+- **Waifu Model Support**: Just replace the `stable-diffusion\sd-v1-4.ckpt` file after installation with the Waifu model
+- Supports "*Text to Image*" and "*Image to Image*"
 - **NSFW Setting**: A setting in the UI to control *NSFW content*
- **JPEG/PNG output**
- **Save generated images to disk**
 - **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
 - **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project.
 - **Low Memory Usage**: Creates 512x512 images with less than 4GB of VRAM!
- **Developer Console**: A developer-mode for those who want to modify their Stable Diffusion code, and edit the conda environment.

-### Easy for new users:
-![Screenshot of the initial UI](media/shot-v10-simple.jpg?raw=true)
-
-### Powerful features for advanced users:
-![Screenshot of advanced settings](media/shot-v10.jpg?raw=true)
-
-### Live Preview
-Useful for judging (and stopping) an image quickly, without waiting for it to finish rendering.
+![Screenshot of advanced settings](media/shot-v9.jpg?raw=true)

+## Live Preview
 ![live-512](https://user-images.githubusercontent.com/844287/192097249-729a0a1e-a677-485e-9ccc-16a9e848fabe.gif)

-### Task Queue
-![Screenshot of task queue](media/task-queue-v1.jpg?raw=true)

 # System Requirements
 1. Windows 10/11, or Linux. Experimental support for Mac is coming soon.
-2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. If you don't have a compatible graphics card, it'll automatically run in the slower "CPU Mode".
-3. Minimum 8 GB of RAM and 25GB of disk space.
+2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. But if you don't have a compatible graphics card, you can still use it with a "Use CPU" setting. It'll be very slow, but it should still work.

-You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed.
+You do not need anything else. You do not need WSL, Docker or Conda. The installer will take care of it.

 # Installation
-1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.3.5/stable-diffusion-ui-windows.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.3.5/stable-diffusion-ui-linux.zip).
+1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-linux.tar.xz).

 2. **Extract**:
  - For Windows: After unzipping the file, please move the `stable-diffusion-ui` folder to your `C:` (or any drive like D:, at the top root level), e.g. `C:\stable-diffusion-ui`. This will avoid a common problem with Windows (file path length limits).
@ -85,19 +56,49 @@ This will automatically install Stable Diffusion, set it up, and start the inter

 **To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages.

-# How to use?
-Please use our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use) to understand how to use the features in this UI.
+
+# Usage
+Open http://localhost:9000 in your browser (after running step 3 previously). It may take a few moments for the back-end to be ready.
+
+## With a text description
+1. Enter a text prompt, like `a photograph of an astronaut riding a horse` in the textbox.
+2. Press `Make Image`. This will take some time, depending on your system's processing power.
+3. See the image generated using your prompt.
+
+## With an image
+1. Click `Browse..` next to `Initial Image`. Select your desired image.
+2. An optional text prompt can help you further describe the kind of image you want to generate.
+3. Press `Make Image`. See the image generated using your prompt.
+
+You can use Face Correction or Upscaling to improve the image further.
+
+**Pro tip:** You can also click `Use as Input` on a generated image, to use it as the input image for your next generation. This can be useful for sequentially refining the generated image with a single click.
+
+**Another tip:** Images with the same aspect ratio of your generated image work best. E.g. 1:1 if you're generating images sized 512x512.
+
+## Problems? Troubleshooting
+Please try the common [troubleshooting](Troubleshooting.md) steps. If that doesn't fix it, please ask on the [discord server](https://discord.com/invite/u9yhsFmEkB), or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
+
+# Image Settings
+You can also set the configuration like `seed`, `width`, `height`, `num_outputs`, `num_inference_steps` and `guidance_scale` using the 'show' button next to 'Image settings'.
+
+Use the same `seed` number to get the same image for a certain prompt. This is useful for refining a prompt without losing the basic image design. Enable the `random images` checkbox to get random images.
+
+![Screenshot of advanced settings](media/config-v6.jpg?raw=true)
+
+# System Settings
+The system settings are reachable via the cogwheel symbol on the top right. It can be used to configure whether all generated images should 
+saved be automically, or to tune the Stable Diffusion image generation.
+
+![Screenshot of advanced settings](media/system-settings-v2.jpg?raw=true)
+
+# Image Modifiers
+![Screenshot of advanced settings](media/modifiers-v1.jpg?raw=true)

 # Bugs reports and code contributions welcome
 If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).

-We could really use help on these aspects (click to view tasks that need your help):
-* [User Interface](https://github.com/users/cmdr2/projects/1/views/1)
-* [Engine](https://github.com/users/cmdr2/projects/3/views/1)
-* [Installer](https://github.com/users/cmdr2/projects/4/views/1)
-* [Documentation](https://github.com/users/cmdr2/projects/5/views/1)
-
-If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users.
+Also, please feel free to submit a pull request, if you have any code contributions in mind. Join the [discord server](https://discord.com/invite/u9yhsFmEkB) for development-related discussions, and for helping other users.

 # Disclaimer
 The authors of this project are not responsible for any content generated using this interface.
--- a/Troubleshooting.md
+++ b/Troubleshooting.md
@ -1 +1,75 @@
-Moved to https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
+Common issues and their solutions. If these solutions don't work, please feel free to ask at the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
+
+## RuntimeError: CUDA out of memory
+This can happen if your PC has less than 6GB of VRAM.
+
+Try disabling the "Turbo mode" setting under "Advanced Settings", since that takes an additional 1 GB of VRAM (to increase the speed).
+
+Additionally, a common reason for this error is that you're using an initial image larger than 768x768 pixels. Try using a smaller initial image.
+
+Also try generating smaller sized images.
+
+## basicsr module not found
+For Windows: Please download and extract basicsr from [here](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/basicsr-win64.zip), and place the `basicsr` folder inside the `stable-diffusion-ui\stable-diffusion\env\lib\site-packages` folder. Then run the `Start Stable Diffusion UI.cmd` file again.
+
+For Linux: Please contact on the [discord server](https://discord.com/invite/u9yhsFmEkB).
+
+## No ldm found, or antlr4 or any other missing module, or ClobberError: This transaction has incompatible packages due to a shared path
+On Windows, please ensure that you had placed the `stable-diffusion-ui` folder after unzipping to the root of C: or D: (or any drive). For e.g. `C:\stable-diffusion-ui`. **Note:** This has to be done **before** you start the installation process. If you have already installed (and are facing this error), please delete the installed folder, and start fresh by unzipping and placing the folder at the top of your drive.
+
+This error can also be caused if you already have conda/miniconda/anaconda installed, due to package conflicts. Please open your Anaconda Prompt, and run `conda clean --all` to clean up unused packages.
+
+If nothing works, this could be due to a corrupted installation. Please try reinstalling this, by deleting the installed folder, and unzipping from the downloaded zip file.
+
+## Killed uvicorn server:app --app-dir ... --port 9000 --host 0.0.0.0
+This happens if your PC ran out of RAM. Stable Diffusion requires a lot of RAM, and requires atleast 10 GB of RAM to work well. You can also try closing all other applications before running Stable Diffusion UI.
+
+## Green image generated
+This usually happens if you're running NVIDIA 1650 or 1660 Super. To solve this, please close and run the Stable Diffusion command on your computer. If you're using the older Docker-based solution (v1), please upgrade to v2: https://github.com/cmdr2/stable-diffusion-ui/tree/v2#installation
+
+If you're still seeing this error, please try enabling "Full Precision" under "Advanced Settings" in the Stable Diffusion UI.
+
+## './docker-compose.yml' is invalid:
+> ERROR: The Compose file './docker-compose.yml' is invalid because:
+> services.stability-ai.deploy.resources.reservations value Additional properties are not allowed ('devices' was unexpected)
+
+Please ensure you have `docker-compose` version 1.29 or higher. Check `docker-compose --version`, and if required [update it to 1.29](https://docs.docker.com/compose/install/). (Thanks [HVRyan](https://github.com/HVRyan))
+
+## RuntimeError: Found no NVIDIA driver on your system:
+If you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), please ensure that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877). (Thanks [u/exintrovert420](https://www.reddit.com/user/exintrovert420/))
+
+## Some other process is already running at port 9000 / port 9000 could not be bound
+You can override the port used. Please change `docker-compose.yml` inside the project directory, and update the line `9000:9000` to `1337:9000` (where 1337 is whichever port number you want).
+
+After doing this, please restart your server, by running `./server restart`.
+
+After this, you can access the server at `http://localhost:1337` (where 1337 is the new port you specified earlier).
+
+## RuntimeError: CUDA error: unknown error
+Please ensure that you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), and that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877).
+
+Also, if you are using WSL (Windows), please ensure you have the latest WSL kernel by running `wsl --shutdown` and then `wsl --update`. (Thanks [AndrWeisR](https://github.com/AndrWeisR))
+
+# For support queries
+## Entering a conda environment in an existing installation
+This will give you an activated conda environment in the terminal, so you can run commands and force-install any packages, if required.
+
+Users don't need to have the Anaconda Prompt installed to do this anymore, since the installer bundles a portable version of conda inside it. Just follow these steps.
+
+**Windows:**
+1. Open the terminal: Press Win+R, type "cmd", and press "Run"
+2. Type `cd C:\stable-diffusion-ui` and press enter (or wherever you've installed it)
+3. Type `installer\Scripts\activate.bat` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate .\env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+**Windows:**
+1. Open the terminal
+2. Type `cd /path/to/stable-diffusion-ui` and press enter
+3. Type `installer/bin/activate` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate ./env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+This will give you an activated conda environment. To confirm, type `python --version` and press enter. You should see 3.8.5.
--- a/build.bat
+++ b/build.bat
@ -8,40 +8,40 @@
 set /p answer=Are you a developer of this project (Y/N)?
 if /i "%answer:~,1%" NEQ "Y" exit /b

-mkdir dist\win\stable-diffusion-ui\scripts
-@REM mkdir dist\linux-mac\stable-diffusion-ui\scripts
+@set PYTHONNOUSERSITE=1

-@rem copy the installer files for Windows
+@mkdir dist\stable-diffusion-ui

-copy scripts\on_env_start.bat dist\win\stable-diffusion-ui\scripts\
-copy scripts\bootstrap.bat dist\win\stable-diffusion-ui\scripts\
-copy "scripts\Start Stable Diffusion UI.cmd" dist\win\stable-diffusion-ui\
-copy LICENSE dist\win\stable-diffusion-ui\
-copy "CreativeML Open RAIL-M License" dist\win\stable-diffusion-ui\
-copy "How to install and run.txt" dist\win\stable-diffusion-ui\
-echo. > dist\win\stable-diffusion-ui\scripts\install_status.txt
+@echo "Downloading components for the installer.."

-@rem copy the installer files for Linux and Mac
+@call conda env create --prefix installer -f environment.yaml
+@call conda activate .\installer

-@REM copy scripts\on_env_start.sh dist\linux-mac\stable-diffusion-ui\scripts\
-@REM copy scripts\bootstrap.sh dist\linux-mac\stable-diffusion-ui\scripts\
-@REM copy scripts\start.sh dist\linux-mac\stable-diffusion-ui\
-@REM copy LICENSE dist\linux-mac\stable-diffusion-ui\
-@REM copy "CreativeML Open RAIL-M License" dist\linux-mac\stable-diffusion-ui\
-@REM copy "How to install and run.txt" dist\linux-mac\stable-diffusion-ui\
-@REM echo. > dist\linux-mac\stable-diffusion-ui\scripts\install_status.txt
+@echo "Creating a distributable package.."

-@rem make the zip
+@call conda install -c conda-forge -y conda-pack
+@call conda pack --n-threads -1 --prefix installer --format tar

-cd dist\win
-call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-windows.zip
-cd ..\..
+@cd dist\stable-diffusion-ui
+@mkdir installer

-@REM cd dist\linux-mac
-@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux.zip
-@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac.zip
-@REM cd ..\..
+@call tar -xf ..\..\installer.tar -C installer

-echo "Build ready. Upload the zip files inside the 'dist' folder."
+@mkdir scripts

-pause
+@copy ..\..\scripts\on_env_start.bat scripts\
+@copy "..\..\scripts\Start Stable Diffusion UI.cmd" .
+@copy ..\..\LICENSE .
+@copy "..\..\CreativeML Open RAIL-M License" .
+@copy "..\..\How to install and run.txt" .
+@echo. > scripts\install_status.txt
+
+@echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
+
+@echo "Cleaning up.."
+
+@cd ..\..
+
+@rmdir /s /q installer
+
+@del installer.tar
--- a/build.sh
+++ b/build.sh
@ -11,39 +11,45 @@ case $yn in
    * ) exit;;
 esac

-# mkdir -p dist/win/stable-diffusion-ui/scripts
-mkdir -p dist/linux-mac/stable-diffusion-ui/scripts
+export PYTHONNOUSERSITE=1

-# copy the installer files for Windows
+mkdir -p dist/stable-diffusion-ui

-# cp scripts/on_env_start.bat dist/win/stable-diffusion-ui/scripts/
-# cp scripts/bootstrap.bat dist/win/stable-diffusion-ui/scripts/
-# cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/
-# cp LICENSE dist/win/stable-diffusion-ui/
-# cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/
-# cp "How to install and run.txt" dist/win/stable-diffusion-ui/
-# echo "" > dist/win/stable-diffusion-ui/scripts/install_status.txt
+echo "Downloading components for the installer.."

-# copy the installer files for Linux and Mac
+source ~/miniconda3/etc/profile.d/conda.sh

-cp scripts/on_env_start.sh dist/linux-mac/stable-diffusion-ui/scripts/
-cp scripts/bootstrap.sh dist/linux-mac/stable-diffusion-ui/scripts/
-cp scripts/functions.sh dist/linux-mac/stable-diffusion-ui/scripts/
-cp scripts/start.sh dist/linux-mac/stable-diffusion-ui/
-cp LICENSE dist/linux-mac/stable-diffusion-ui/
-cp "CreativeML Open RAIL-M License" dist/linux-mac/stable-diffusion-ui/
-cp "How to install and run.txt" dist/linux-mac/stable-diffusion-ui/
-echo "" > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt
+conda install -c conda-forge -y conda-pack

-# make the zip
+conda env create --prefix installer -f environment.yaml
+conda activate ./installer

-# cd dist/win
-# zip -r ../stable-diffusion-ui-windows.zip stable-diffusion-ui
-# cd ../..
+echo "Creating a distributable package.."
+
+conda pack --n-threads -1 --prefix installer --format tar
+
+cd dist/stable-diffusion-ui
+mkdir installer
+
+tar -xf ../../installer.tar -C installer
+
+mkdir scripts
+
+cp ../../scripts/on_env_start.sh scripts/
+cp ../../scripts/start.sh .
+cp ../../LICENSE .
+cp "../../CreativeML Open RAIL-M License" .
+cp "../../How to install and run.txt" .
+echo "" > scripts/install_status.txt
+
+chmod u+x start.sh
+
+echo "Build ready. Zip the 'dist/stable-diffusion-ui' folder."
+
+echo "Cleaning up.."

-cd dist/linux-mac
-zip -r ../stable-diffusion-ui-linux.zip stable-diffusion-ui
-zip -r ../stable-diffusion-ui-mac.zip stable-diffusion-ui
 cd ../..

-echo "Build ready. Upload the zip files inside the 'dist' folder."
+rm -rf installer
+
+rm installer.tar
--- a/media/config-v7.jpg
+++ b/media/config-v7.jpg
--- a/media/shot-v10-simple.jpg
+++ b/media/shot-v10-simple.jpg
--- a/media/shot-v10.jpg
+++ b/media/shot-v10.jpg
--- a/media/task-queue-v1.jpg
+++ b/media/task-queue-v1.jpg
--- a/scripts/Developer
+++ b/scripts/Developer
@ -1,34 +0,0 @@
-@echo off
-
-echo "Opening Stable Diffusion UI - Developer Console.." & echo.
-
-set PATH=C:\Windows\System32;%PATH%
-
-@rem set legacy and new installer's PATH, if they exist
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
-
-set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
-
-@rem activate the installer env
-call conda activate
-
-@rem Test the environment
-echo "Environment Info:"
-call where git
-call git --version
-
-call where conda
-call conda --version
-
-echo.
-
-@rem activate the environment
-call conda activate .\stable-diffusion\env
-
-call where python
-call python --version
-
-echo.
-
-cmd /k
--- a/scripts/Start
+++ b/scripts/Start
@ -1,27 +1,19 @@
@echo off

-cd /d %~dp0
-set PATH=C:\Windows\System32;%PATH%
+@REM Delete the post-activate hook from the old installer
+if exist "installer\etc\conda\activate.d\post_activate.bat" (
+    echo. > installer\etc\conda\activate.d\post_activate.bat
+)

-@rem set legacy installer's PATH, if it exists
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
+@call installer\Scripts\activate.bat

-@rem Setup the packages required for the installer
-call scripts\bootstrap.bat
+@call conda-unpack

-@rem set new installer's PATH, if it downloaded any packages
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
+@call conda --version
+@call git --version

-set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
+@cd installer

-@rem Test the bootstrap
-call where git
-call git --version
-
-call where conda
-call conda --version
-
-@rem Download the rest of the installer and UI
-call scripts\on_env_start.bat
+@call ..\scripts\on_env_start.bat

@pause
--- a/scripts/bootstrap.bat
+++ b/scripts/bootstrap.bat
@ -1,77 +0,0 @@
-@echo off
-
-@rem This script will install git and conda (if not found on the PATH variable)
-@rem  using micromamba (an 8mb static-linked single-file binary, conda replacement).
-@rem For users who already have git and conda, this step will be skipped.
-
-@rem This enables a user to install this project without manually installing conda and git.
-
-@rem config
-set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
-set INSTALL_ENV_DIR=%cd%\installer_files\env
-set LEGACY_INSTALL_ENV_DIR=%cd%\installer
-set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe
-set umamba_exists=F
-
-set OLD_APPDATA=%APPDATA%
-set OLD_USERPROFILE=%USERPROFILE%
-set APPDATA=%cd%\installer_files\appdata
-set USERPROFILE=%cd%\profile
-
-@rem figure out whether git and conda needs to be installed
-if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH%
-
-set PACKAGES_TO_INSTALL=
-
-if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" (
-    if not exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda
-)
-
-call git --version >.tmp1 2>.tmp2
-if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git
-
-call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2
-if "%ERRORLEVEL%" EQU "0" set umamba_exists=T
-
-@rem (if necessary) install git and conda into a contained environment
-if "%PACKAGES_TO_INSTALL%" NEQ "" (
-    @rem download micromamba
-    if "%umamba_exists%" == "F" (
-        echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe"
-
-        mkdir "%MAMBA_ROOT_PREFIX%"
-        call curl -Lk "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe"
-
-        @REM if "%ERRORLEVEL%" NEQ "0" (
-        @REM     echo "There was a problem downloading micromamba. Cannot continue."
-        @REM     pause
-        @REM     exit /b
-        @REM )
-
-        mkdir "%APPDATA%"
-        mkdir "%USERPROFILE%"
-
-        @rem test the mamba binary
-        echo Micromamba version:
-        call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version
-    )
-
-    @rem create the installer env
-    if not exist "%INSTALL_ENV_DIR%" (
-        call "%MAMBA_ROOT_PREFIX%\micromamba.exe" create -y --prefix "%INSTALL_ENV_DIR%"
-    )
-
-    echo "Packages to install:%PACKAGES_TO_INSTALL%"
-
-    call "%MAMBA_ROOT_PREFIX%\micromamba.exe" install -y --prefix "%INSTALL_ENV_DIR%" -c conda-forge %PACKAGES_TO_INSTALL%
-
-    if not exist "%INSTALL_ENV_DIR%" (
-        echo "There was a problem while installing%PACKAGES_TO_INSTALL% using micromamba. Cannot continue."
-        pause
-        exit /b
-    )
-)
-
-@rem revert to the old APPDATA. only needed it for bypassing a bug in micromamba (with special characters)
-set APPDATA=%OLD_APPDATA%
-set USERPROFILE=%OLD_USERPROFILE%
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@ -1,86 +0,0 @@
-#!/bin/bash
-
-# This script will install git and conda (if not found on the PATH variable)
-#  using micromamba (an 8mb static-linked single-file binary, conda replacement).
-# For users who already have git and conda, this step will be skipped.
-
-# This enables a user to install this project without manually installing conda and git.
-
-source ./scripts/functions.sh
-
-set -o pipefail
-
-OS_NAME=$(uname -s)
-case "${OS_NAME}" in
-    Linux*)     OS_NAME="linux";;
-    Darwin*)    OS_NAME="osx";;
-    *)          echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit
-esac
-
-OS_ARCH=$(uname -m)
-case "${OS_ARCH}" in
-    x86_64*)    OS_ARCH="64";;
-    arm64*)     OS_ARCH="arm64";;
-    *)          echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit
-esac
-
-# https://mamba.readthedocs.io/en/latest/installation.html
-if [ "$OS_NAME" == "linux" ] && [ "$OS_ARCH" == "arm64" ]; then OS_ARCH="aarch64"; fi
-
-# config
-export MAMBA_ROOT_PREFIX="$(pwd)/installer_files/mamba"
-INSTALL_ENV_DIR="$(pwd)/installer_files/env"
-LEGACY_INSTALL_ENV_DIR="$(pwd)/installer"
-MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest"
-umamba_exists="F"
-
-# figure out whether git and conda needs to be installed
-if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi
-
-PACKAGES_TO_INSTALL=""
-
-if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi
-if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi
-
-if "$MAMBA_ROOT_PREFIX/micromamba" --version &>/dev/null; then umamba_exists="T"; fi
-
-# (if necessary) install git and conda into a contained environment
-if [ "$PACKAGES_TO_INSTALL" != "" ]; then
-    # download micromamba
-    if [ "$umamba_exists" == "F" ]; then
-        echo "Downloading micromamba from $MICROMAMBA_DOWNLOAD_URL to $MAMBA_ROOT_PREFIX/micromamba"
-
-        mkdir -p "$MAMBA_ROOT_PREFIX"
-        curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj bin/micromamba -O > "$MAMBA_ROOT_PREFIX/micromamba"
-
-        if [ "$?" != "0" ]; then
-            echo
-            echo "EE micromamba download failed"
-            echo "EE If the lines above contain 'bzip2: Cannot exec', your system doesn't have bzip2 installed"
-            echo "EE If there are network errors, please check your internet setup"
-            fail "micromamba download failed"
-        fi
-
-        chmod u+x "$MAMBA_ROOT_PREFIX/micromamba"
-
-        # test the mamba binary
-        echo "Micromamba version:"
-        "$MAMBA_ROOT_PREFIX/micromamba" --version
-    fi
-
-    # create the installer env
-    if [ ! -e "$INSTALL_ENV_DIR" ]; then
-        "$MAMBA_ROOT_PREFIX/micromamba" create -y --prefix "$INSTALL_ENV_DIR" || fail "unable to create the install environment"
-    fi
-   
-    if [ ! -e "$INSTALL_ENV_DIR" ]; then
-        fail "There was a problem while installing$PACKAGES_TO_INSTALL using micromamba. Cannot continue."
-    fi
-
-    echo "Packages to install:$PACKAGES_TO_INSTALL"
-
-    "$MAMBA_ROOT_PREFIX/micromamba" install -y --prefix "$INSTALL_ENV_DIR" -c conda-forge $PACKAGES_TO_INSTALL
-    if [ "$?" != "0" ]; then
-        fail "Installation of the packages '$PACKAGES_TO_INSTALL' failed."
-    fi
-fi
--- a/scripts/developer_console.sh
+++ b/scripts/developer_console.sh
@ -1,42 +0,0 @@
-#!/bin/bash
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-if [ "$0" == "bash" ]; then
-  echo "Opening Stable Diffusion UI - Developer Console.."
-  echo ""
-
-  # set legacy and new installer's PATH, if they exist
-  if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
-  if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
-
-  # activate the installer env
-  CONDA_BASEPATH=$(conda info --base)
-  source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
-
-  conda activate
-
-  # test the environment
-  echo "Environment Info:"
-  which git
-  git --version
-
-  which conda
-  conda --version
-
-  echo ""
-
-  # activate the environment
-  CONDA_BASEPATH=$(conda info --base)
-  source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script)
-
-  conda activate ./stable-diffusion/env
-
-  which python
-  python --version
-
-  echo ""
-else
-  file_name=$(basename "${BASH_SOURCE[0]}")
-  bash --init-file "$file_name"
-fi
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@ -1,32 +0,0 @@
-#
-# utility functions for all scripts
-#
-
-fail() {
-    echo
-    echo "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
-    echo
-    if [ "$1" != "" ]; then
-        echo ERROR: $1
-    else
-        echo An error occurred.
-    fi
-    cat <<EOF
-
-Error downloading Stable Diffusion UI. Sorry about that, please try to:
- 1. Run this installer again.
- 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
- 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB
- 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
-
-Thanks!
-
-
-EOF
-    read -p "Press any key to continue"
-    exit 1
-
-}
-
-
-
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@ -4,6 +4,8 @@

 set PATH=C:\Windows\System32;%PATH%

+@cd ..
+
 if exist "scripts\config.bat" (
    @call scripts\config.bat
 )
@ -12,7 +14,7 @@ if "%update_branch%"=="" (
    set update_branch=main
 )

-@>nul findstr /m "conda_sd_ui_deps_installed" scripts\install_status.txt
+@>nul grep -c "conda_sd_ui_deps_installed" scripts\install_status.txt
@if "%ERRORLEVEL%" NEQ "0" (
    for /f "tokens=*" %%a in ('python -c "import os; parts = os.getcwd().split(os.path.sep); print(len(parts))"') do if "%%a" NEQ "2" (
        echo. & echo "!!!! WARNING !!!!" & echo.
@ -26,14 +28,14 @@ if "%update_branch%"=="" (
    )
 )

-@>nul findstr /m "sd_ui_git_cloned" scripts\install_status.txt
+@>nul grep -c "sd_ui_git_cloned" scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (
    @echo "Stable Diffusion UI's git repository was already installed. Updating from %update_branch%.."

    @cd sd-ui-files

    @call git reset --hard
-    @call git -c advice.detachedHead=false checkout "%update_branch%"
+    @call git checkout "%update_branch%"
    @call git pull

    @cd ..
@ -44,18 +46,16 @@ if "%update_branch%"=="" (
    @call git clone -b "%update_branch%" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files && (
        @echo sd_ui_git_cloned >> scripts\install_status.txt
    ) || (
-        @echo "Error downloading Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
+        @echo "Error downloading Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
        pause
        @exit /b
    )
 )

-@xcopy sd-ui-files\ui ui /s /i /Y /q
+@xcopy sd-ui-files\ui ui /s /i /Y
@copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
-@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
@copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
-@copy "sd-ui-files\scripts\Developer Console.cmd" . /Y

@call scripts\on_sd_start.bat

-@pause
+@pause
--- a/scripts/on_env_start.sh
+++ b/scripts/on_env_start.sh
@ -1,7 +1,5 @@
 #!/bin/bash

-source ./scripts/functions.sh
-
 printf "\n\nStable Diffusion UI\n\n"

 if [ -f "scripts/config.sh" ]; then
@ -18,7 +16,7 @@ if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/in
    cd sd-ui-files

    git reset --hard
-    git -c advice.detachedHead=false checkout "$update_branch"
+    git checkout "$update_branch"
    git pull

    cd ..
@ -29,16 +27,16 @@ else
    if git clone -b "$update_branch" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files ; then
        echo sd_ui_git_cloned >> scripts/install_status.txt
    else
-        fail "git clone failed"
+        printf "\n\nError downloading Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi
 fi

 rm -rf ui
 cp -Rf sd-ui-files/ui .
 cp sd-ui-files/scripts/on_sd_start.sh scripts/
-cp sd-ui-files/scripts/bootstrap.sh scripts/
 cp sd-ui-files/scripts/start.sh .
-cp sd-ui-files/scripts/developer_console.sh .

 ./scripts/on_sd_start.sh

--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@ -1,24 +1,13 @@
@echo off

@copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y
-@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
-
-if exist "%cd%\profile" (
-    set USERPROFILE=%cd%\profile
-)
-
-@rem activate the installer env
-call conda activate

@REM Caution, this file will make your eyes and brain bleed. It's such an unholy mess.
@REM Note to self: Please rewrite this in Python. For the sake of your own sanity.

-@REM remove the old version of the dev console script, if it's still present
-if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
-
@call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"

-@>nul findstr /m "sd_git_cloned" scripts\install_status.txt
+@>nul grep -c "sd_git_cloned" scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (
    @echo "Stable Diffusion's git repository was already installed. Updating.."

@ -26,7 +15,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"

    @call git reset --hard
    @call git pull
-    @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+    @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c

    @call git apply ..\ui\sd_internal\ddim_callback.patch
    @call git apply ..\ui\sd_internal\env_yaml.patch
@ -38,13 +27,13 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
    @call git clone https://github.com/basujindal/stable-diffusion.git && (
        @echo sd_git_cloned >> scripts\install_status.txt
    ) || (
-        @echo "Error downloading Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
+        @echo "Error downloading Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
        pause
        @exit /b
    )

    @cd stable-diffusion
-    @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+    @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c

    @call git apply ..\ui\sd_internal\ddim_callback.patch
    @call git apply ..\ui\sd_internal\env_yaml.patch
@ -54,7 +43,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"

@cd stable-diffusion

-@>nul findstr /m "conda_sd_env_created" ..\scripts\install_status.txt
+@>nul grep -c "conda_sd_env_created" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (
    @echo "Packages necessary for Stable Diffusion were already installed"

@ -67,14 +56,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
    @REM prevent conda from using packages from the user's home directory, to avoid conflicts
    @set PYTHONNOUSERSITE=1

-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
-
    @call conda env create --prefix env -f environment.yaml || (
-        @echo. & echo "Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -82,13 +65,13 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
    @call conda activate .\env

    @call conda install -c conda-forge -y --prefix env antlr4-python3-runtime=4.8 || (
-        @echo. & echo "Error installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )

    for /f "tokens=*" %%a in ('python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Dependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -98,7 +81,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"

 set PATH=C:\Windows\System32;%PATH%

-@>nul findstr /m "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
+@>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (
    @echo "Packages necessary for GFPGAN (Face Correction) were already installed"
 ) else (
@ -106,26 +89,20 @@ set PATH=C:\Windows\System32;%PATH%

    @set PYTHONNOUSERSITE=1

-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
-
    @call pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN || (
-        @echo. & echo "Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )

    @call pip install basicsr==1.4.2 || (
-        @echo. & echo "Error installing the basicsr package necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error installing the basicsr package necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )

    for /f "tokens=*" %%a in ('python -c "from gfpgan import GFPGANer; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Dependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -133,7 +110,7 @@ set PATH=C:\Windows\System32;%PATH%
    @echo conda_sd_gfpgan_deps_installed >> ..\scripts\install_status.txt
 )

-@>nul findstr /m "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt
+@>nul grep -c "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (
    @echo "Packages necessary for ESRGAN (Resolution Upscaling) were already installed"
 ) else (
@ -141,20 +118,14 @@ set PATH=C:\Windows\System32;%PATH%

    @set PYTHONNOUSERSITE=1

-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
-
    @call pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan || (
-        @echo. & echo "Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )

    for /f "tokens=*" %%a in ('python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Dependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -162,7 +133,7 @@ set PATH=C:\Windows\System32;%PATH%
    @echo conda_sd_esrgan_deps_installed >> ..\scripts\install_status.txt
 )

-@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
+@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" EQU "0" (
    echo "Packages necessary for Stable Diffusion UI were already installed"
 ) else (
@ -170,39 +141,28 @@ set PATH=C:\Windows\System32;%PATH%

    @set PYTHONNOUSERSITE=1

-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
-
    @call conda install -c conda-forge -y --prefix env uvicorn fastapi || (
-        echo "Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
+        echo "Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
        pause
        exit /b
    )
 )

 call WHERE uvicorn > .tmp
-@>nul findstr /m "uvicorn" .tmp
+@>nul grep -c "uvicorn" .tmp
@if "%ERRORLEVEL%" NEQ "0" (
-    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
    pause
    exit /b
 )

-@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
+@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" NEQ "0" (
    @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
 )



-if not exist "..\models\stable-diffusion" mkdir "..\models\stable-diffusion"
-if not exist "..\models\vae" mkdir "..\models\vae"
-echo. > "..\models\stable-diffusion\Put your custom ckpt files here.txt"
-echo. > "..\models\vae\Put your VAE files here.txt"
-
@if exist "sd-v1-4.ckpt" (
    for %%I in ("sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
        echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 4 GB Model."
@ -228,12 +188,12 @@ echo. > "..\models\vae\Put your VAE files here.txt"
    @if exist "sd-v1-4.ckpt" (
        for %%I in ("sd-v1-4.ckpt") do if "%%~zI" NEQ "4265380512" (
            echo. & echo "Error: The downloaded model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+            echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
            pause
            exit /b
        )
    ) else (
-        @echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -258,12 +218,12 @@ echo. > "..\models\vae\Put your VAE files here.txt"
    @if exist "GFPGANv1.3.pth" (
        for %%I in ("GFPGANv1.3.pth") do if "%%~zI" NEQ "348632874" (
            echo. & echo "Error: The downloaded GFPGAN model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+            echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
            pause
            exit /b
        )
    ) else (
-        @echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -288,12 +248,12 @@ echo. > "..\models\vae\Put your VAE files here.txt"
    @if exist "RealESRGAN_x4plus.pth" (
        for %%I in ("RealESRGAN_x4plus.pth") do if "%%~zI" NEQ "67040989" (
            echo. & echo "Error: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
            pause
            exit /b
        )
    ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -318,12 +278,12 @@ echo. > "..\models\vae\Put your VAE files here.txt"
    @if exist "RealESRGAN_x4plus_anime_6B.pth" (
        for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" (
            echo. & echo "Error: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
            pause
            exit /b
        )
    ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
        pause
        exit /b
    )
@ -331,37 +291,7 @@ echo. > "..\models\vae\Put your VAE files here.txt"



-@if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
-    for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" EQU "334695179" (
-        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
-    ) else (
-        echo. & echo "The default VAE (sd-vae-ft-mse-original) file present at models\vae\vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt"
-    )
-)
-
-@if not exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
-    @echo. & echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).." & echo.
-
-    @call curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt
-
-    @if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
-        for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" NEQ "334695179" (
-            echo. & echo "Error: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@>nul findstr /m "sd_install_complete" ..\scripts\install_status.txt
+@>nul grep -c "sd_install_complete" ..\scripts\install_status.txt
@if "%ERRORLEVEL%" NEQ "0" (
    @echo sd_weights_downloaded >> ..\scripts\install_status.txt
    @echo sd_install_complete >> ..\scripts\install_status.txt
@ -376,16 +306,12 @@ echo. > "..\models\vae\Put your VAE files here.txt"
@cd ..\..\..
@echo PYTHONPATH=%PYTHONPATH%

-call where python
-call python --version
-
@cd ..
@set SD_UI_PATH=%cd%\ui
@cd stable-diffusion

-@if NOT DEFINED SD_UI_BIND_PORT set SD_UI_BIND_PORT=9000
-@if NOT DEFINED SD_UI_BIND_IP set SD_UI_BIND_IP=0.0.0.0
-@uvicorn server:app --app-dir "%SD_UI_PATH%" --port %SD_UI_BIND_PORT% --host %SD_UI_BIND_IP%
+@call python --version

+@uvicorn server:app --app-dir "%SD_UI_PATH%" --port 9000 --host 0.0.0.0

-@pause
+@pause
--- a/scripts/on_sd_start.sh
+++ b/scripts/on_sd_start.sh
@ -1,22 +1,10 @@
 #!/bin/bash

-source ./scripts/functions.sh
-
 cp sd-ui-files/scripts/on_env_start.sh scripts/
-cp sd-ui-files/scripts/bootstrap.sh scripts/

-# activate the installer env
-CONDA_BASEPATH=$(conda info --base)
-source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
+source installer/etc/profile.d/conda.sh

-conda activate || fail "Failed to activate conda"
-
-# remove the old version of the dev console script, if it's still present
-if [ -e "open_dev_console.sh" ]; then
-    rm "open_dev_console.sh"
-fi
-
-python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" 
+python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"

 # Caution, this file will make your eyes and brain bleed. It's such an unholy mess.
 # Note to self: Please rewrite this in Python. For the sake of your own sanity.
@ -28,10 +16,10 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta

    git reset --hard
    git pull
-    git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+    git checkout f6cfebffa752ee11a7b07497b8529d5971de916c

-    git apply ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
-    git apply ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed"
+    git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch

    cd ..
 else
@ -40,14 +28,16 @@ else
    if git clone https://github.com/basujindal/stable-diffusion.git ; then
        echo sd_git_cloned >> scripts/install_status.txt
    else
-        fail "git clone of basujindal/stable-diffusion.git failed"
+        printf "\n\nError downloading Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    cd stable-diffusion
-    git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+    git checkout f6cfebffa752ee11a7b07497b8529d5971de916c

-    git apply ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
-    git apply ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed"
+    git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch

    cd ..
 fi
@ -57,32 +47,37 @@ cd stable-diffusion
 if [ `grep -c conda_sd_env_created ../scripts/install_status.txt` -gt "0" ]; then
    echo "Packages necessary for Stable Diffusion were already installed"

-    conda activate ./env || fail "conda activate failed"
+    conda activate ./env
 else
    printf "\n\nDownloading packages necessary for Stable Diffusion..\n"
    printf "\n\n***** This will take some time (depending on the speed of the Internet connection) and may appear to be stuck, but please be patient ***** ..\n\n"

    # prevent conda from using packages from the user's home directory, to avoid conflicts
    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"

    if conda env create --prefix env --force -f environment.yaml ; then
        echo "Installed. Testing.."
    else
-        fail "'conda env create' failed"
+        printf "\n\nError installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

-    conda activate ./env || fail "conda activate failed"
+    conda activate ./env

    if conda install -c conda-forge --prefix ./env -y antlr4-python3-runtime=4.8 ; then
        echo "Installed. Testing.."
    else
-        fail "Error installing antlr4-python3-runtime"
+        printf "\n\nError installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"`
    if [ "$out_test" != "42" ]; then
-        fail "Dependency test failed"
+        printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    echo conda_sd_env_created >> ../scripts/install_status.txt
@ -94,20 +89,20 @@ else
    printf "\n\nDownloading packages necessary for GFPGAN (Face Correction)..\n"

    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"

    if pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN ; then
        echo "Installed. Testing.."
    else
-        fail "Error installing the packages necessary for GFPGAN (Face Correction)."
+        printf "\n\nError installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    out_test=`python -c "from gfpgan import GFPGANer; print(42)"`
    if [ "$out_test" != "42" ]; then
-        echo "EE The dependency check has failed. This usually means that some system libraries are missing."
-	echo "EE On Debian/Ubuntu systems, this are often these packages: libsm6 libxext6 libxrender-dev"
-	echo "EE Other Linux distributions might have different package names for these libraries."
-        fail "GFPGAN dependency test failed"
+        printf "\n\nDependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    echo conda_sd_gfpgan_deps_installed >> ../scripts/install_status.txt
@ -119,17 +114,20 @@ else
    printf "\n\nDownloading packages necessary for ESRGAN (Resolution Upscaling)..\n"

    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"

    if pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan ; then
        echo "Installed. Testing.."
    else
-        fail "Error installing the packages necessary for ESRGAN"
+        printf "\n\nError installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    out_test=`python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"`
    if [ "$out_test" != "42" ]; then
-        fail "ESRGAN dependency test failed"
+        printf "\n\nDependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    echo conda_sd_esrgan_deps_installed >> ../scripts/install_status.txt
@ -141,16 +139,19 @@ else
    printf "\n\nDownloading packages necessary for Stable Diffusion UI..\n\n"

    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"

    if conda install -c conda-forge --prefix ./env -y uvicorn fastapi ; then
        echo "Installed. Testing.."
    else
-        fail "'conda install uvicorn' failed" 
+        printf "\n\nError installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    if ! command -v uvicorn &> /dev/null; then
-        fail "UI packages not found!"
+        printf "\n\nUI packages not found! Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi

    echo conda_sd_ui_deps_installed >> ../scripts/install_status.txt
@ -158,13 +159,8 @@ fi



-mkdir -p "../models/stable-diffusion"
-mkdir -p "../models/vae"
-echo "" > "../models/stable-diffusion/Put your custom ckpt files here.txt"
-echo "" > "../models/vae/Put your VAE files here.txt"
-
 if [ -f "sd-v1-4.ckpt" ]; then
-    model_size=`find "sd-v1-4.ckpt" -printf "%s"`
+    model_size=`ls -l sd-v1-4.ckpt | awk '{print $5}'`

    if [ "$model_size" -eq "4265380512" ] || [ "$model_size" -eq "7703807346" ] || [ "$model_size" -eq "7703810927" ]; then
        echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
@ -180,18 +176,23 @@ if [ ! -f "sd-v1-4.ckpt" ]; then
    curl -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt

    if [ -f "sd-v1-4.ckpt" ]; then
-        model_size=`find "sd-v1-4.ckpt" -printf "%s"`
+        model_size=`ls -l sd-v1-4.ckpt | awk '{print $5}'`
        if [ ! "$model_size" == "4265380512" ]; then
-	    fail "The downloaded model file was invalid! Bytes downloaded: $model_size"
+            printf "\n\nError: The downloaded model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            read -p "Press any key to continue"
+            exit
        fi
    else
-        fail "Error downloading the data files (weights) for Stable Diffusion"
+        printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi
 fi


 if [ -f "GFPGANv1.3.pth" ]; then
-    model_size=`find "GFPGANv1.3.pth" -printf "%s"`
+    model_size=`ls -l GFPGANv1.3.pth | awk '{print $5}'`

    if [ "$model_size" -eq "348632874" ]; then
        echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
@ -207,18 +208,23 @@ if [ ! -f "GFPGANv1.3.pth" ]; then
    curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > GFPGANv1.3.pth

    if [ -f "GFPGANv1.3.pth" ]; then
-        model_size=`find "GFPGANv1.3.pth" -printf "%s"`
+        model_size=`ls -l GFPGANv1.3.pth | awk '{print $5}'`
        if [ ! "$model_size" -eq "348632874" ]; then
-            fail "The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size"
+            printf "\n\nError: The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            read -p "Press any key to continue"
+            exit
        fi
    else
-        fail "Error downloading the data files (weights) for GFPGAN (Face Correction)."
+        printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi
 fi


 if [ -f "RealESRGAN_x4plus.pth" ]; then
-    model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
+    model_size=`ls -l RealESRGAN_x4plus.pth | awk '{print $5}'`

    if [ "$model_size" -eq "67040989" ]; then
        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
@ -234,18 +240,23 @@ if [ ! -f "RealESRGAN_x4plus.pth" ]; then
    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth

    if [ -f "RealESRGAN_x4plus.pth" ]; then
-        model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
+        model_size=`ls -l RealESRGAN_x4plus.pth | awk '{print $5}'`
        if [ ! "$model_size" -eq "67040989" ]; then
-            fail "The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size"
+            printf "\n\nError: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            read -p "Press any key to continue"
+            exit
        fi
    else
-        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus"
+        printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
    fi
 fi


 if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-    model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
+    model_size=`ls -l RealESRGAN_x4plus_anime_6B.pth | awk '{print $5}'`

    if [ "$model_size" -eq "17938799" ]; then
        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
@ -261,42 +272,15 @@ if [ ! -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth

    if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-        model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
+        model_size=`ls -l RealESRGAN_x4plus_anime_6B.pth | awk '{print $5}'`
        if [ ! "$model_size" -eq "17938799" ]; then
-            fail "The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime."
-    fi
-fi
-
-
-if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
-    model_size=`find ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt -printf "%s"`
-
-    if [ "$model_size" -eq "334695179" ]; then
-        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
-    else
-        printf "\n\nThe model file present at models/vae/vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
-    fi
-fi
-
-if [ ! -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
-    echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).."
-
-    curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
-
-    if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
-        model_size=`find ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt -printf "%s"`
-        if [ ! "$model_size" -eq "334695179" ]; then
-            printf "\n\nError: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            printf "\n\nError: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
            read -p "Press any key to continue"
            exit
        fi
    else
-        printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
        read -p "Press any key to continue"
        exit
    fi
@ -311,16 +295,15 @@ fi
 printf "\n\nStable Diffusion is ready!\n\n"

 SD_PATH=`pwd`
-export PYTHONPATH="$SD_PATH:$SD_PATH/env/lib/python3.8/site-packages"
+export PYTHONPATH="$SD_PATH;$SD_PATH/env/lib/python3.8/site-packages"
 echo "PYTHONPATH=$PYTHONPATH"

-which python
-python --version
-
 cd ..
 export SD_UI_PATH=`pwd`/ui
 cd stable-diffusion

-uvicorn server:app --app-dir "$SD_UI_PATH" --port ${SD_UI_BIND_PORT:-9000} --host ${SD_UI_BIND_IP:-0.0.0.0}
+python --version
+
+uvicorn server:app --app-dir "$SD_UI_PATH" --port 9000 --host 0.0.0.0

 read -p "Press any key to continue"
--- a/scripts/start.sh
+++ b/scripts/start.sh
@ -1,22 +1,10 @@
 #!/bin/bash

-cd "$(dirname "${BASH_SOURCE[0]}")"
+source installer/bin/activate

-# set legacy installer's PATH, if it exists
-if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
+conda-unpack

-# Setup the packages required for the installer
-scripts/bootstrap.sh || exit 1
+conda --version
+git --version

-# set new installer's PATH, if it downloaded any packages
-if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
-
-# Test the bootstrap
-which git
-git --version || exit 1
-
-which conda
-conda --version || exit 1
-
-# Download the rest of the installer and UI
 scripts/on_env_start.sh
--- a/ui/frontend/assets/ding.mp3
+++ b/ui/frontend/assets/ding.mp3
--- a/ui/frontend/assets/kofi.png
+++ b/ui/frontend/assets/kofi.png
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/artstation/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/artstation/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/artstation/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/artstation/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_agnes_lawrence_pelton/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_agnes_lawrence_pelton/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_agnes_lawrence_pelton/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_agnes_lawrence_pelton/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_akihito_yoshida/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_akihito_yoshida/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_akihito_yoshida/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_akihito_yoshida/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_alex_grey/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_alex_grey/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_alex_grey/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_alex_grey/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_alexander_jansson/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_alexander_jansson/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_alexander_jansson/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_alexander_jansson/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_alphonse_mucha/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_alphonse_mucha/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_alphonse_mucha/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_alphonse_mucha/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_andy_warhol/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_andy_warhol/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_andy_warhol/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_andy_warhol/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_artgerm/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_artgerm/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_artgerm/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_artgerm/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_asaf_hanuka/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_asaf_hanuka/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_asaf_hanuka/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_asaf_hanuka/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_aubrey_beardsley/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_aubrey_beardsley/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_aubrey_beardsley/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_aubrey_beardsley/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_banksy/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_banksy/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_banksy/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_banksy/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_beeple/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_beeple/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_beeple/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_beeple/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_ben_enwonwu/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_ben_enwonwu/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_ben_enwonwu/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_ben_enwonwu/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_bob_eggleton/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_bob_eggleton/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_bob_eggleton/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_bob_eggleton/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_caravaggio_michelangelo_merisi/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_caravaggio_michelangelo_merisi/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_caravaggio_michelangelo_merisi/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_caravaggio_michelangelo_merisi/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_caspar_david_friedrich/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_caspar_david_friedrich/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_caspar_david_friedrich/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_caspar_david_friedrich/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_chris_foss/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_chris_foss/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_chris_foss/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_chris_foss/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_claude_monet/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_claude_monet/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_claude_monet/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_claude_monet/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_dan_mumford/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_dan_mumford/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_dan_mumford/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_dan_mumford/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_david_mann/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_david_mann/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_david_mann/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_david_mann/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_diego_vela_zquez/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_diego_vela_zquez/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_diego_vela_zquez/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_diego_vela_zquez/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_disney_animation_studios/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_disney_animation_studios/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_disney_animation_studios/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_disney_animation_studios/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_e_douard_manet/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_e_douard_manet/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_e_douard_manet/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_e_douard_manet/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_esao_andrews/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_esao_andrews/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_esao_andrews/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_esao_andrews/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_frida_kahlo/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_frida_kahlo/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_frida_kahlo/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_frida_kahlo/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_gediminas_pranckevicius/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_gediminas_pranckevicius/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_gediminas_pranckevicius/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_gediminas_pranckevicius/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_georgia_o_keeffe/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_georgia_o_keeffe/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_georgia_o_keeffe/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_georgia_o_keeffe/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_greg_rutkowski/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_greg_rutkowski/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_greg_rutkowski/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_greg_rutkowski/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_dore_/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_dore_/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_dore_/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_dore_/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_klimt/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_klimt/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_klimt/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_gustave_klimt/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_h_r_giger/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_h_r_giger/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_h_r_giger/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_h_r_giger/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_hayao_miyazaki/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_hayao_miyazaki/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_hayao_miyazaki/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_hayao_miyazaki/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_henri_matisse/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_henri_matisse/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_henri_matisse/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_henri_matisse/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_hp_lovecraft/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_hp_lovecraft/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_hp_lovecraft/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_hp_lovecraft/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_ivan_shishkin/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_ivan_shishkin/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_ivan_shishkin/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_ivan_shishkin/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_jack_kirby/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_jack_kirby/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_jack_kirby/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_jack_kirby/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_jackson_pollock/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_jackson_pollock/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_jackson_pollock/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_jackson_pollock/portrait-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_james_jean/landscape-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_james_jean/landscape-0.jpg
--- a/ui/frontend/assets/media/modifier-thumbnails/artist/by_james_jean/portrait-0.jpg
+++ b/ui/frontend/assets/media/modifier-thumbnails/artist/by_james_jean/portrait-0.jpg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
cmdr2	355870a750	Revert "Merge pull request #294 from cmdr2/main" This reverts commit `1e3b4f9969`, reversing changes made to `e0c0935d3a`.	2022-10-07 20:07:15 +05:30
cmdr2	1e3b4f9969	Merge pull request #294 from cmdr2/main Merge from main	2022-10-07 20:03:01 +05:30