Make execute permission conditional on .NET Core

This commit is contained in:
flightlevel 2019-03-05 22:09:20 +11:00
parent cf7ca97f9c
commit b8aa2a16dd
2 changed files with 13 additions and 9 deletions

View File

@ -185,7 +185,7 @@ Task("Package-DotNetCore-LinuxAMDx64")
CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath); CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
CopyFileToDirectory("./Upstart.config", 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") Task("Package-DotNetCore-LinuxARM32")

View File

@ -297,16 +297,20 @@ namespace Jackett.Common.Services
gzipStream.Close(); gzipStream.Close();
inStream.Close(); inStream.Close();
// When the files get extracted, the execute permission for jackett and JackettUpdater don't get carried across if (variant == Variants.JackettVariant.CoreMacOs || variant == Variants.JackettVariant.CoreLinuxAmdx64 ||
UnixFileInfo jackettFI = new UnixFileInfo(Path.Combine(tempDir, "/Jackett/jackett")) 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")) UnixFileInfo jackettUpdaterFI = new UnixFileInfo(Path.Combine(tempDir + "/Jackett/JackettUpdater"))
{ {
FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute | FileAccessPermissions.GroupRead | FileAccessPermissions.OtherRead
}; };
}
} }
return tempDir; return tempDir;