Skip to content

Commit 63ee4ec

Browse files
committed
Fix
1 parent 7ff0f6c commit 63ee4ec

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

CustomizePlus/Core/Helpers/VersionHelper.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ public static bool IsTrustedBuild(IDalamudPluginInterface pi) =>
5454

5555
public static string GetInstallationSource(IDalamudPluginInterface pi)
5656
{
57-
var checkedDirectory = pi.AssemblyLocation.Directory?.Parent?.Parent?.Name;
58-
var ret = checkedDirectory?.Equals("installedPlugins", StringComparison.OrdinalIgnoreCase) ?? false;
59-
60-
if (ret)
61-
return checkedDirectory!;
62-
63-
return pi.SourceRepository;
57+
return $"{pi.SourceRepository} ({pi.AssemblyLocation.Directory?.FullName ?? "Unknown directory"})";
6458
}
6559
}

CustomizePlus/Core/Services/SupportLogBuilderService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public string BuildSupportLog()
4040
{
4141
var sb = new StringBuilder(102400); //it's fair to assume this will very often be quite large
4242
sb.AppendLine("**Settings**");
43-
sb.Append($"> **`Plugin Version: `** {VersionHelper.Version}\n");
43+
sb.Append($"> **`Plugin Version: `** {VersionHelper.Version} ({_dalamudPluginInterface.Manifest.InternalName})\n");
4444
sb.Append($"> **`Commit Hash: `** {ThisAssembly.Git.Commit}+{ThisAssembly.Git.Sha}\n");
4545
sb.Append($"> **`Trusted build: `** {VersionHelper.IsTrustedBuild(_dalamudPluginInterface)}\n");
4646
sb.Append($"> **`Installation source: `** {VersionHelper.GetInstallationSource(_dalamudPluginInterface)}\n");

CustomizePlus/CustomizePlus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public CustomizePlus(IDalamudPluginInterface pluginInterface)
4545
Logger.Information($"Customize+ {VersionHelper.Version} ({ThisAssembly.Git.Commit}+{ThisAssembly.Git.Sha}) [FantasiaPlus] started");
4646

4747
if (!VersionHelper.IsTrustedBuild(pluginInterface)) //for the love of god don't be an asshole and never delete this.
48-
Logger.Fatal($"This is not a trusted build of Customize+. This build is installed from: {VersionHelper.GetInstallationSource(pluginInterface)}.");
48+
Logger.Fatal($"This is not a trusted build of Customize+. This build is installed from: {VersionHelper.GetInstallationSource(pluginInterface)}. Internal name: ({pluginInterface.Manifest.InternalName})");
4949
}
5050
catch (Exception ex)
5151
{

0 commit comments

Comments
 (0)