From 222183c651c5b5d9e402db1b8009e2e0a0681b06 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 4 Apr 2021 11:37:11 -0400
Subject: standardize spelling of 'macOS'

---
 src/SMAPI.Installer/Framework/InstallerContext.cs | 2 +-
 src/SMAPI.Installer/Framework/InstallerPaths.cs   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/SMAPI.Installer/Framework')

diff --git a/src/SMAPI.Installer/Framework/InstallerContext.cs b/src/SMAPI.Installer/Framework/InstallerContext.cs
index 7531eaee..88e57760 100644
--- a/src/SMAPI.Installer/Framework/InstallerContext.cs
+++ b/src/SMAPI.Installer/Framework/InstallerContext.cs
@@ -35,7 +35,7 @@ namespace StardewModdingAPI.Installer.Framework
         /// <summary>Whether the installer is running on Windows.</summary>
         public bool IsWindows => this.Platform == Platform.Windows;
 
-        /// <summary>Whether the installer is running on a Unix OS (including Linux or MacOS).</summary>
+        /// <summary>Whether the installer is running on a Unix OS (including Linux or macOS).</summary>
         public bool IsUnix => !this.IsWindows;
 
 
diff --git a/src/SMAPI.Installer/Framework/InstallerPaths.cs b/src/SMAPI.Installer/Framework/InstallerPaths.cs
index ac6c3a8e..2cabf88b 100644
--- a/src/SMAPI.Installer/Framework/InstallerPaths.cs
+++ b/src/SMAPI.Installer/Framework/InstallerPaths.cs
@@ -47,13 +47,13 @@ namespace StardewModdingAPI.Installer.Framework
         /// <summary>The full path to the installed SMAPI executable file.</summary>
         public string ExecutablePath { get; }
 
-        /// <summary>The full path to the vanilla game launcher on Linux/Mac.</summary>
+        /// <summary>The full path to the vanilla game launcher on Linux/macOS.</summary>
         public string UnixLauncherPath { get; }
 
-        /// <summary>The full path to the installed SMAPI launcher on Linux/Mac before it's renamed.</summary>
+        /// <summary>The full path to the installed SMAPI launcher on Linux/macOS before it's renamed.</summary>
         public string UnixSmapiLauncherPath { get; }
 
-        /// <summary>The full path to the vanilla game launcher on Linux/Mac after SMAPI is installed.</summary>
+        /// <summary>The full path to the vanilla game launcher on Linux/macOS after SMAPI is installed.</summary>
         public string UnixBackupLauncherPath { get; }
 
 
-- 
cgit 


From 47a806533b9fbcfe3fc771316283a7734702baae Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 23 Apr 2021 02:05:14 -0400
Subject: add 64-bit support to the SMAPI installer (#767)

---
 src/SMAPI.Installer/Framework/InstallerPaths.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Installer/Framework')

diff --git a/src/SMAPI.Installer/Framework/InstallerPaths.cs b/src/SMAPI.Installer/Framework/InstallerPaths.cs
index 2cabf88b..6ba5fa5f 100644
--- a/src/SMAPI.Installer/Framework/InstallerPaths.cs
+++ b/src/SMAPI.Installer/Framework/InstallerPaths.cs
@@ -44,8 +44,8 @@ namespace StardewModdingAPI.Installer.Framework
         /// <summary>The full path to the user's config overrides file.</summary>
         public string ApiUserConfigPath { get; }
 
-        /// <summary>The full path to the installed SMAPI executable file.</summary>
-        public string ExecutablePath { get; }
+        /// <summary>The full path to the installed game executable file.</summary>
+        public string ExecutablePath { get; private set; }
 
         /// <summary>The full path to the vanilla game launcher on Linux/macOS.</summary>
         public string UnixLauncherPath { get; }
@@ -79,5 +79,12 @@ namespace StardewModdingAPI.Installer.Framework
             this.ApiConfigPath = Path.Combine(gameDir.FullName, "smapi-internal", "config.json");
             this.ApiUserConfigPath = Path.Combine(gameDir.FullName, "smapi-internal", "config.user.json");
         }
+
+        /// <summary>Override the filename for the <see cref="ExecutablePath"/>.</summary>
+        /// <param name="filename">the file name.</param>
+        public void SetExecutableFileName(string filename)
+        {
+            this.ExecutablePath = Path.Combine(this.GamePath, filename);
+        }
     }
 }
-- 
cgit