From 489cacca5ef79a77ca04d12395ff1ec5c7a05c5f Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 23 Apr 2017 19:12:48 -0400 Subject: minor cleanup --- .../InteractiveInstaller.cs | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/StardewModdingAPI.Installer') diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs index b59e8305..e1e62d89 100644 --- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs +++ b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs @@ -65,30 +65,30 @@ namespace StardewModdingApi.Installer /// The folder for SMAPI mods. private IEnumerable GetUninstallPaths(DirectoryInfo installDir, DirectoryInfo modsDir) { - Func installPath = path => Path.Combine(installDir.FullName, path); + string GetInstallPath(string path) => Path.Combine(installDir.FullName, path); // common - yield return installPath("Mono.Cecil.dll"); - yield return installPath("Newtonsoft.Json.dll"); - yield return installPath("StardewModdingAPI.exe"); - yield return installPath("StardewModdingAPI.config.json"); - yield return installPath("StardewModdingAPI.data.json"); - yield return installPath("StardewModdingAPI.AssemblyRewriters.dll"); - yield return installPath("steam_appid.txt"); + yield return GetInstallPath("Mono.Cecil.dll"); + yield return GetInstallPath("Newtonsoft.Json.dll"); + yield return GetInstallPath("StardewModdingAPI.exe"); + yield return GetInstallPath("StardewModdingAPI.config.json"); + yield return GetInstallPath("StardewModdingAPI.data.json"); + yield return GetInstallPath("StardewModdingAPI.AssemblyRewriters.dll"); + yield return GetInstallPath("steam_appid.txt"); // Linux/Mac only - yield return installPath("StardewModdingAPI"); - yield return installPath("StardewModdingAPI.exe.mdb"); - yield return installPath("System.Numerics.dll"); - yield return installPath("System.Runtime.Caching.dll"); + yield return GetInstallPath("StardewModdingAPI"); + yield return GetInstallPath("StardewModdingAPI.exe.mdb"); + yield return GetInstallPath("System.Numerics.dll"); + yield return GetInstallPath("System.Runtime.Caching.dll"); // Windows only - yield return installPath("StardewModdingAPI.pdb"); + yield return GetInstallPath("StardewModdingAPI.pdb"); // obsolete - yield return installPath("Mods/.cache"); // 1.3-1.4 - yield return installPath("Mono.Cecil.Rocks.dll"); // 1.3–1.8 - yield return installPath("StardewModdingAPI-settings.json"); // 1.0-1.4 + yield return GetInstallPath("Mods/.cache"); // 1.3-1.4 + yield return GetInstallPath("Mono.Cecil.Rocks.dll"); // 1.3–1.8 + yield return GetInstallPath("StardewModdingAPI-settings.json"); // 1.0-1.4 if (modsDir.Exists) { foreach (DirectoryInfo modDir in modsDir.EnumerateDirectories()) -- cgit