StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix installer not ignoring potential game folders that don't contain a Stardew Valley exe

This commit is contained in:
Jesse Plamondon-Willard 2017-02-19 01:07:04 -05:00
parent b2efd34fec
commit a893cd9eea
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release-notes.md
View File

@ -9,6 +9,7 @@ For players:
* Simple nested mod folders are now recognised by SMAPI (e.g. `ModName-1.0\ModName\manifest.json`).
* Fixed game's debug output being shown in the console for all users.
* Fixed installer errors for some players when deleting files.
* Fixed installer not ignoring potential game folders that don't contain a Stardew Valley exe.
* Fixed rare issue where mod dependencies would override SMAPI dependencies and cause unpredictable bugs.
For mod developers:

12
src/StardewModdingAPI.Installer/InteractiveInstaller.cs
View File

@ -435,10 +435,16 @@ namespace StardewModdingApi.Installer
/// <param name="platform">The current platform.</param>
private DirectoryInfo InteractivelyGetInstallPath(Platform platform)
{
// get executable name
string executableFilename = platform == Platform.Windows
? "Stardew Valley.exe"
: "StardewValley.exe";
// try default paths
foreach (string defaultPath in this.DefaultInstallPaths)
{
if (Directory.Exists(defaultPath))
DirectoryInfo dir = new DirectoryInfo(defaultPath);
if (dir.Exists && dir.EnumerateFiles(executableFilename).Any())
return new DirectoryInfo(defaultPath);
}
@ -447,7 +453,7 @@ namespace StardewModdingApi.Installer
while (true)
{
// get path from user
Console.WriteLine($"Type the file path to the game directory (the one containing '{(platform == Platform.Mono ? "StardewValley.exe" : "Stardew Valley.exe")}'), then press enter.");
Console.WriteLine($"Type the file path to the game directory (the one containing '{executableFilename}'), then press enter.");
string path = Console.ReadLine()?.Trim();
if (string.IsNullOrWhiteSpace(path))
{
@ -470,7 +476,7 @@ namespace StardewModdingApi.Installer
Console.WriteLine(" That directory doesn't seem to exist.");
continue;
}
if (!directory.EnumerateFiles("*.exe").Any(p => p.Name == "StardewValley.exe" || p.Name == "Stardew Valley.exe"))
if (!directory.EnumerateFiles(executableFilename).Any())
{
Console.WriteLine(" That directory doesn't contain a Stardew Valley executable.");
continue;