mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

Disable Mono.Posix

This commit is contained in:
flightlevel 2019-03-06 19:51:59 +11:00
parent 5a7091075e
commit e7d9360b51
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.cake
View File

@ -185,7 +185,7 @@ Task("Package-DotNetCore-LinuxAMDx64")
CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
CopyFileToDirectory("./Upstart.config", buildOutputPath);
Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxAMDx64.tar.gz");
Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Experimental.Jackett.Binaries.LinuxAMDx64.tar.gz");
});
Task("Package-DotNetCore-LinuxARM32")

2
src/Jackett.Common/Jackett.Common.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="MimeMapping" Version="1.0.1.12" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<!--<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />-->
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />

39
src/Jackett.Common/Services/UpdateService.cs
View File

@ -17,8 +17,7 @@ using Jackett.Common.Models.GitHub;
using Jackett.Common.Services.Interfaces;
using Jackett.Common.Utils;
using Jackett.Common.Utils.Clients;
using Mono.Posix;
using Mono.Unix;
//using Mono.Posix;
using Newtonsoft.Json;
using NLog;
@ -291,27 +290,29 @@ namespace Jackett.Common.Services
gzipStream.Close();
inStream.Close();
if (variant == Variants.JackettVariant.CoreMacOs || variant == Variants.JackettVariant.CoreLinuxAmdx64 ||
variant == Variants.JackettVariant.CoreLinuxArm32 || variant == Variants.JackettVariant.CoreLinuxArm64)
{
// When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across
//Disabled as the Mono.Posix.NETStandard library causes issues outside of .NET Core
//https://github.com/xamarin/XamarinComponents/issues/282
//if (variant == Variants.JackettVariant.CoreMacOs || variant == Variants.JackettVariant.CoreLinuxAmdx64
//|| variant == Variants.JackettVariant.CoreLinuxArm32 || variant == Variants.JackettVariant.CoreLinuxArm64)
//{
// // When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across
string jackettPath = tempDir + "/Jackett/jackett";
logger.Debug($"Giving execute permission to jackett from: {jackettPath}");
// string jackettPath = tempDir + "/Jackett/jackett";
// logger.Debug($"Giving execute permission to jackett from: {jackettPath}");
UnixFileInfo jackettFI = new UnixFileInfo(jackettPath)
{
FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead
};
// UnixFileInfo jackettFI = new UnixFileInfo(jackettPath)
// {
// FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead
// };
string jackettUpdaterPath = tempDir + "/Jackett/JackettUpdater";
logger.Debug($"Giving execute permission to JackettUpdater from: {jackettUpdaterPath}");
// string jackettUpdaterPath = tempDir + "/Jackett/JackettUpdater";
// logger.Debug($"Giving execute permission to JackettUpdater from: {jackettUpdaterPath}");
UnixFileInfo jackettUpdaterFI = new UnixFileInfo(jackettUpdaterPath)
{
FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead
};
}
// UnixFileInfo jackettUpdaterFI = new UnixFileInfo(jackettUpdaterPath)
// {
// FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead
// };
//}
}
return tempDir;