shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Set musl status at compile time

Browse Source 
[common]
This commit is contained in:
ta264
2021-01-21 21:16:33 +00:00
committed by Qstick
parent 853a15087d
commit 00c2211d45
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs
View File

@@ -97,16 +97,14 @@ namespace NzbDrone.Common.EnvironmentInfo
} }
else else
{ {
return IsMusl() ? Os.LinuxMusl : Os.Linux; #if ISMUSL
return Os.LinuxMusl;
#else
return Os.Linux;
#endif
} }
} }
private static bool IsMusl()
{
var output = RunAndCapture("ldd", "/bin/ls");
return output.Contains("libc.musl");
}
private static string RunAndCapture(string filename, string args) private static string RunAndCapture(string filename, string args)
{ {
var processStartInfo = new ProcessStartInfo var processStartInfo = new ProcessStartInfo

1
src/NzbDrone.Common/Prowlarr.Common.csproj
View File

@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0;net472</TargetFrameworks> <TargetFrameworks>net5.0;net472</TargetFrameworks>
<DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" /> <PackageReference Include="DotNet4.SocksProxy" Version="1.4.0.1" />