From e7d9360b5138f0a8a6fe176cea9a45f1bb68d660 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Wed, 6 Mar 2019 19:51:59 +1100 Subject: [PATCH] Disable Mono.Posix --- build.cake | 2 +- src/Jackett.Common/Jackett.Common.csproj | 2 +- src/Jackett.Common/Services/UpdateService.cs | 39 ++++++++++---------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/build.cake b/build.cake index 672389b54..eeb23ccba 100644 --- a/build.cake +++ b/build.cake @@ -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") diff --git a/src/Jackett.Common/Jackett.Common.csproj b/src/Jackett.Common/Jackett.Common.csproj index 8d4fa3621..467e6e3e7 100644 --- a/src/Jackett.Common/Jackett.Common.csproj +++ b/src/Jackett.Common/Jackett.Common.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs index 87cb154d5..cf0643523 100644 --- a/src/Jackett.Common/Services/UpdateService.cs +++ b/src/Jackett.Common/Services/UpdateService.cs @@ -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;