Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Commit

Permalink
moment
Browse files Browse the repository at this point in the history
  • Loading branch information
misandrie committed Nov 28, 2023
1 parent ca80a91 commit c623d5a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: [ '7.0.x' ]

steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions Marsey/FileHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public static void LoadExactAssembly(string file, bool subverter)
Assembly assembly = Assembly.LoadFrom(file);
PatchAssemblyManager.InitAssembly(assembly, subverter);
}
catch (FileNotFoundException ex)
catch (FileNotFoundException)
{
if (file.EndsWith("Subverter.dll")) return;
if (file.EndsWith("Subverter.dll") && subverter) return;
Utility.Log(Utility.LogType.DEBG, $"{file} could not be found");
}
catch (PatchAssemblyException ex)
Expand Down
5 changes: 3 additions & 2 deletions SS14.Launcher/Models/Connector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -664,22 +664,23 @@ private static async Task<ProcessStartInfo> GetLoaderStartInfo()
// Fucking stupid since we can clearly just work around it like this...
// Thank you, Blaisorblade on Ask Different
// https://apple.stackexchange.com/questions/105155/denied-file-read-access-on-file-i-own-and-have-full-r-w-permissions-on
var xattr = Process.Start(new ProcessStartInfo
Process? xattr = Process.Start(new ProcessStartInfo
{
FileName = "xattr",
ArgumentList = {"-d", "com.apple.quarantine", appPath},
RedirectStandardError = true,
RedirectStandardOutput = true
});

if (xattr == null) throw new NotSupportedException("Unsupported platform.");
PipeLogOutput(xattr);

await xattr.WaitForExitAsync();

return new ProcessStartInfo
{
FileName = "open",
ArgumentList = {appPath, "--args"},
ArgumentList = { appPath, "--args" },
};
}
else
Expand Down
2 changes: 1 addition & 1 deletion publish_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$(dirname "$0")"
rm -r **/bin bin/publish/Linux
rm SS14.Launcher_Linux.zip

dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r linux-x64 --framework net7.0 /nologo /p:RobustILLink=true
dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r linux-x64 /nologo /p:RobustILLink=true
dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r linux-x64 /nologo

# Create intermediate directories.
Expand Down

0 comments on commit c623d5a

Please sign in to comment.