oh and handle path correctly

Author: mcmonkey4eva

README.md

@@ -83,7 +83,7 @@ Note: if you're on Windows 10, you may need to manually install [git](https://gi
 - Install `git` and `python3` via your OS package manager if they are not already installed (make sure to include `pip` and `venv` on distros that do not include them in python directly)
     - For example, on some Ubuntu (desktop) versions, `sudo apt install git python3-pip python3-venv`, or you may need <https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa>
     - For Debian or Ubuntu Server, `sudo apt install git python3-full`
-    - You'll want Python 3.11 or 3.12. Things should also work fine with 3.10. Do not use 3.13.
+    - You'll want Python 3.11 or 3.12. Things should also work fine with 3.10. Do not use 3.13 or later.
     - Make sure `python3.11 -m pip --version` returns a valid package
 
 ### Linux Easy Install
@@ -97,13 +97,14 @@ Note: if you're on Windows 10, you may need to manually install [git](https://gi
 
 ### Linux Manual Install
 
-- Current version targets .NET 8, but a future version will target .NET 10, so install both:
-- Install DotNET 8 using the instructions at https://dotnet.microsoft.com/en-us/download/dotnet/8.0 (you need `dotnet-sdk-8.0`, as that includes all relevant sub-packages)
-- Install DotNET 8 using the instructions at https://dotnet.microsoft.com/en-us/download/dotnet/10.0 (you need `dotnet-sdk-10.0`, as that includes all relevant sub-packages)
-- Open a shell terminal and `cd` to a directory you want to install into
 - Run shell commands:
     - `git clone https://github.com/mcmonkeyprojects/SwarmUI`
     - cd `SwarmUI`
+- Current version targets .NET 8, but a future version will target .NET 10, so install both:
+    - You can run shell command `./launchtools/linux-dotnet-install.sh`, or separately follow the instructions at:
+        - <https://dotnet.microsoft.com/en-us/download/dotnet/8.0> and also <https://dotnet.microsoft.com/en-us/download/dotnet/10.0> (you need `dotnet-sdk-8.0`/`dotnet-sdk-10.0`, as that includes all relevant sub-packages)
+- Open a shell terminal and `cd` to a directory you want to install into
+- To launch, in the shell run:
     - `./launch-linux.sh`
     - or if running on a headless server, `./launch-linux.sh --launch_mode none --host 0.0.0.0` and/or swap host for [cloudflared](/docs/Advanced%20Usage.md)
 - open `http://localhost:7801/Install` (if it doesn't launch itself)

launchtools/install-linux.sh

@@ -19,7 +19,8 @@ git clone https://github.com/mcmonkeyprojects/SwarmUI
 cd SwarmUI
 
 # install dotnet
-./launchtools/linux-dotnet-install.sh
+# Note: manual installers that want to avoid home dir, you can change the path below to "$PWD/.dotnet"
+./launchtools/linux-dotnet-install.sh "$HOME/.dotnet"
 
 # Launch
 ./launch-linux.sh "$@"

launchtools/linux-build-logic.sh

@@ -7,7 +7,7 @@ if [ "$DOTNET_ROOT" = "$SCRIPT_DIR/.dotnet" ] || [ "$DOTNET_ROOT" = "$HOME/.dotn
     if ! dotnet --list-sdks 2>/dev/null | grep -q "^10\.0"; then
         echo "Installing dotnet 10 to user-local dir, if you don't want this you have 15 seconds to CTRL+C this terminal, then go manually install dotnet 10"
         sleep 15
-        ./launchtools/linux-dotnet-install.sh
+        ./launchtools/linux-dotnet-install.sh "$DOTNET_ROOT"
     fi
 fi
 

launchtools/linux-dotnet-install.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# First arg is the target install dir, only "$HOME/.dotnet" and "$PWD/.dotnet" are fully supported by Swarm autodetect for launching
+INSTALL_DIR="${1:-$HOME/.dotnet}"
+
 # install dotnet
 cd launchtools
 rm dotnet-install.sh
@@ -8,10 +11,9 @@ wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
 chmod +x dotnet-install.sh
 cd ..
 
-# Note: manual installers that want to avoid home dir, add to both of the below lines: --install-dir "$PWD/.dotnet"
-./launchtools/dotnet-install.sh --channel 10.0 --runtime aspnetcore
-./launchtools/dotnet-install.sh --channel 10.0
-./launchtools/dotnet-install.sh --channel 8.0 --runtime aspnetcore
-./launchtools/dotnet-install.sh --channel 8.0
+./launchtools/dotnet-install.sh --channel 10.0 --runtime aspnetcore --install-dir "$INSTALL_DIR"
+./launchtools/dotnet-install.sh --channel 10.0 --install-dir "$INSTALL_DIR"
+./launchtools/dotnet-install.sh --channel 8.0 --runtime aspnetcore --install-dir "$INSTALL_DIR"
+./launchtools/dotnet-install.sh --channel 8.0 --install-dir "$INSTALL_DIR"
 
 rm ./launchtools/dotnet-install.sh