github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Set musl status at compile time

Browse source
This commit is contained in:
ta264 2021-01-27 21:35:20 +00:00 • committed by Qstick
commit 3fcd8af697
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)
{ {
Process p = new Process(); Process p = new Process();

1
src/NzbDrone.Common/Lidarr.Common.csproj
View file

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
<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" />