From b8aa2a16dd004250840c7d064dcd0424c3417fe0 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Tue, 5 Mar 2019 22:09:20 +1100 Subject: [PATCH] Make execute permission conditional on .NET Core --- build.cake | 2 +- src/Jackett.Common/Services/UpdateService.cs | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build.cake b/build.cake index eeb23ccba..672389b54 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", "Experimental.Jackett.Binaries.LinuxAMDx64.tar.gz"); + Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxAMDx64.tar.gz"); }); Task("Package-DotNetCore-LinuxARM32") diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs index 958fb37bb..3f7d76d6d 100644 --- a/src/Jackett.Common/Services/UpdateService.cs +++ b/src/Jackett.Common/Services/UpdateService.cs @@ -297,16 +297,20 @@ namespace Jackett.Common.Services gzipStream.Close(); inStream.Close(); - // When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across - UnixFileInfo jackettFI = new UnixFileInfo(Path.Combine(tempDir, "/Jackett/jackett")) + if (variant == Variants.JackettVariant.CoreMacOs || variant == Variants.JackettVariant.CoreLinuxAmdx64 || + variant == Variants.JackettVariant.CoreLinuxArm32 || variant == Variants.JackettVariant.CoreLinuxArm64) { - FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead - }; + // When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across + UnixFileInfo jackettFI = new UnixFileInfo(Path.Combine(tempDir, "/Jackett/jackett")) + { + FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead + }; - UnixFileInfo jackettUpdaterFI = new UnixFileInfo(Path.Combine(tempDir + "/Jackett/JackettUpdater")) - { - FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead - }; + UnixFileInfo jackettUpdaterFI = new UnixFileInfo(Path.Combine(tempDir + "/Jackett/JackettUpdater")) + { + FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead + }; + } } return tempDir;