Skip to content

Commit 87e49cd

Browse files
committed
formatting
1 parent 5975b6e commit 87e49cd

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,14 @@ private static void PreStartCorrectionAfterModeChange(Settings settings)
214214
&& !settings.PluginSettings.PythonExecutablePath.StartsWith(DataLocation.PortableDataPath))
215215
{
216216
settings.PluginSettings.PythonExecutablePath
217-
= GetUpdatedPortablePath(settings.PluginSettings.PythonExecutablePath, DataLocation.PythonEnvironmentName);
217+
= GetUpdatedEnvironmentPath(settings.PluginSettings.PythonExecutablePath);
218218
}
219219

220220
if (IsUsingPortablePath(settings.PluginSettings.NodeExecutablePath, DataLocation.NodeEnvironmentName)
221221
&& !settings.PluginSettings.NodeExecutablePath.StartsWith(DataLocation.PortableDataPath))
222222
{
223223
settings.PluginSettings.NodeExecutablePath
224-
= GetUpdatedPortablePath(settings.PluginSettings.NodeExecutablePath, DataLocation.NodeEnvironmentName);
224+
= GetUpdatedEnvironmentPath(settings.PluginSettings.NodeExecutablePath);
225225
}
226226

227227
// When user has switched from roaming to portable
@@ -241,11 +241,11 @@ private static void PreStartCorrectionAfterModeChange(Settings settings)
241241
{
242242
if (IsUsingPortablePath(settings.PluginSettings.PythonExecutablePath, DataLocation.PythonEnvironmentName))
243243
settings.PluginSettings.PythonExecutablePath
244-
= GetUpdatedPortablePath(settings.PluginSettings.PythonExecutablePath, DataLocation.PythonEnvironmentName);
244+
= GetUpdatedEnvironmentPath(settings.PluginSettings.PythonExecutablePath);
245245

246246
if (IsUsingPortablePath(settings.PluginSettings.NodeExecutablePath, DataLocation.NodeEnvironmentName))
247247
settings.PluginSettings.NodeExecutablePath
248-
= GetUpdatedPortablePath(settings.PluginSettings.NodeExecutablePath, DataLocation.NodeEnvironmentName);
248+
= GetUpdatedEnvironmentPath(settings.PluginSettings.NodeExecutablePath);
249249
}
250250
}
251251

@@ -261,12 +261,13 @@ private static bool IsUsingRoamingPath(string filePath)
261261
return filePath.StartsWith(DataLocation.RoamingDataPath);
262262
}
263263

264-
private static string GetUpdatedPortablePath(string filePath, string pluginEnvironmentName)
264+
private static string GetUpdatedEnvironmentPath(string filePath)
265265
{
266266
var index = filePath.IndexOf(DataLocation.PluginEnvironments);
267-
// get the substring after "Environments" because we can not determine it
268-
var updatedPath = filePath.Substring(index + DataLocation.PluginEnvironments.Count());
269-
return $"{DataLocation.PluginEnvironmentsPath}{updatedPath}";
267+
268+
// get the substring after "Environments" because we can not determine it dynamically
269+
var ExecutablePathSubstring = filePath.Substring(index + DataLocation.PluginEnvironments.Count());
270+
return $"{DataLocation.PluginEnvironmentsPath}{ExecutablePathSubstring}";
270271
}
271272
}
272273
}

0 commit comments

Comments
 (0)