Merge pull request #4026 from erri120/fix-smapi-install

Sewer56 · web-flow · commit 1a9ced60e38a · 2025-10-21T13:37:40.000+01:00
Fix SMAPI installation on Unix systems
diff --git a/src/NexusMods.Games.StardewValley/Installers/SMAPIInstaller.cs b/src/NexusMods.Games.StardewValley/Installers/SMAPIInstaller.cs
@@ -76,7 +76,7 @@ public override async ValueTask<InstallerResult> ExecuteAsync(
         var isUnix = targetOS.IsUnix();
 
         // NOTE(erri120): paths can be verified using Steam depots: https://steamdb.info/app/413150/depots/
-        RelativePath unixLauncherDirectory = targetOS.IsOSX
+        RelativePath unixLauncherFile = targetOS.IsOSX
             ? "Contents/MacOS/StardewValley"
             : "StardewValley";
 
@@ -122,7 +122,7 @@ public override async ValueTask<InstallerResult> ExecuteAsync(
             // https://github.com/Pathoschild/SMAPI/blob/5919337236650c6a0d7755863d35b2923a94775c/src/SMAPI.Installer/InteractiveInstaller.cs#L395-L425
             if (isUnix && fileName.Equals("unix-launcher.sh"))
             {
-                to = new GamePath(LocationId.Game, unixLauncherDirectory / fileName);
+                to = new GamePath(LocationId.Game, unixLauncherFile);
             }
 
             // NOTE(erri120): The official installer doesn't replace "Stardew Valley.exe" with

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public override async ValueTask<InstallerResult> ExecuteAsync(`
`76`	`76`	`var isUnix = targetOS.IsUnix();`
`77`	`77`
`78`	`78`	`// NOTE(erri120): paths can be verified using Steam depots: https://steamdb.info/app/413150/depots/`
`79`		`- RelativePath unixLauncherDirectory = targetOS.IsOSX`
	`79`	`+ RelativePath unixLauncherFile = targetOS.IsOSX`
`80`	`80`	`? "Contents/MacOS/StardewValley"`
`81`	`81`	`: "StardewValley";`
`82`	`82`
`@@ -122,7 +122,7 @@ public override async ValueTask<InstallerResult> ExecuteAsync(`
`122`	`122`	`// https://github.com/Pathoschild/SMAPI/blob/5919337236650c6a0d7755863d35b2923a94775c/src/SMAPI.Installer/InteractiveInstaller.cs#L395-L425`
`123`	`123`	`if (isUnix && fileName.Equals("unix-launcher.sh"))`
`124`	`124`	`{`
`125`		`- to = new GamePath(LocationId.Game, unixLauncherDirectory / fileName);`
	`125`	`+ to = new GamePath(LocationId.Game, unixLauncherFile);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// NOTE(erri120): The official installer doesn't replace "Stardew Valley.exe" with`