summaryrefslogtreecommitdiff
path: root/src/SMAPI.Installer
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-08-17 16:42:04 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-11-28 00:01:44 -0500
commitf6479ea2b61ebcc4eda434d7d5cb664534a99801 (patch)
tree9e6a81adca1860cfdac2e6127bdf548aec9f66b8 /src/SMAPI.Installer
parentce80c68135b08fea7caaa9581b3c4eba61c3ec65 (diff)
downloadSMAPI-f6479ea2b61ebcc4eda434d7d5cb664534a99801.tar.gz
SMAPI-f6479ea2b61ebcc4eda434d7d5cb664534a99801.tar.bz2
SMAPI-f6479ea2b61ebcc4eda434d7d5cb664534a99801.zip
restructure installer for .NET 5 changes
Diffstat (limited to 'src/SMAPI.Installer')
-rw-r--r--src/SMAPI.Installer/Program.cs3
-rw-r--r--src/SMAPI.Installer/assets/README.txt2
-rw-r--r--src/SMAPI.Installer/assets/unix-install.sh2
-rw-r--r--src/SMAPI.Installer/assets/windows-install.bat2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/SMAPI.Installer/Program.cs b/src/SMAPI.Installer/Program.cs
index d9c31dd6..45cfea75 100644
--- a/src/SMAPI.Installer/Program.cs
+++ b/src/SMAPI.Installer/Program.cs
@@ -31,8 +31,7 @@ namespace StardewModdingApi.Installer
public static void Main(string[] args)
{
// find install bundle
- PlatformID platform = Environment.OSVersion.Platform;
- FileInfo zipFile = new FileInfo(Path.Combine(Program.InstallerPath, $"{(platform == PlatformID.Win32NT ? "windows" : "unix")}-install.dat"));
+ FileInfo zipFile = new FileInfo(Path.Combine(Program.InstallerPath, "install.dat"));
if (!zipFile.Exists)
{
Console.WriteLine($"Oops! Some of the installer files are missing; try re-downloading the installer. (Missing file: {zipFile.FullName})");
diff --git a/src/SMAPI.Installer/assets/README.txt b/src/SMAPI.Installer/assets/README.txt
index c3a7e271..5c20529a 100644
--- a/src/SMAPI.Installer/assets/README.txt
+++ b/src/SMAPI.Installer/assets/README.txt
@@ -24,7 +24,7 @@ Manual install
THIS IS NOT RECOMMENDED FOR MOST PLAYERS. See instructions above instead.
If you really want to install SMAPI manually, here's how.
-1. Unzip "internal/windows-install.dat" (on Windows) or "internal/unix-install.dat" (on
+1. Unzip "internal/windows/install.dat" (on Windows) or "internal/unix/install.dat" (on
Linux/macOS). You can change '.dat' to '.zip', it's just a normal zip file renamed to prevent
confusion.
2. Copy the files from the folder you just unzipped into your game folder. The
diff --git a/src/SMAPI.Installer/assets/unix-install.sh b/src/SMAPI.Installer/assets/unix-install.sh
index a830a22d..f5de7b16 100644
--- a/src/SMAPI.Installer/assets/unix-install.sh
+++ b/src/SMAPI.Installer/assets/unix-install.sh
@@ -7,4 +7,4 @@ cd "`dirname "$0"`"
export TERM=xterm
# run installer
-./internal/unix-install
+./internal/unix/install
diff --git a/src/SMAPI.Installer/assets/windows-install.bat b/src/SMAPI.Installer/assets/windows-install.bat
index 2cd98554..3ca13528 100644
--- a/src/SMAPI.Installer/assets/windows-install.bat
+++ b/src/SMAPI.Installer/assets/windows-install.bat
@@ -4,5 +4,5 @@ if not errorlevel 1 (
echo Oops! It looks like you're running the installer from inside a zip file. Make sure you unzip the download first.
pause
) else (
- start /WAIT /B internal\windows-install.exe
+ start /WAIT /B internal\windows\install.exe
)