Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mods not loaded on Linux/macOS if their path has trailing whitespace #958

Closed
wants to merge 2 commits into from
Closed

Fix mods not loaded on Linux/macOS if their path has trailing whitespace #958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dec409d
Fix trailing space mod load
jakerosado Jul 6, 2024
a3b1425
Merge branch 'Pathoschild:develop' into Issue#905
jakerosado Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/SMAPI.Toolkit/Utilities/PathUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,13 @@ public static string[] GetSegments(string? path, int? limit = null)
#endif
public static string? NormalizePath(string? path)
{
path = path?.Trim();
if (string.IsNullOrEmpty(path))
return path;

// check for trailing space in directory before trimming
if (!path.EndsWith(" "))
path = path.Trim();

// get basic path format (e.g. /some/asset\\path/ => some\asset\path)
string[] segments = PathUtilities.GetSegments(path);
string newPath = string.Join(PathUtilities.PreferredPathSeparator.ToString(), segments);
Expand Down