Backup_Repos/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2026-05-08 21:21:47 +02:00
Code Issues Projects Releases Wiki Activity

Fixed binary execute permissions for osx and Radarr

Browse source
This commit is contained in:
Taloth Saldono 2020-11-22 17:10:29 +01:00
parent 2c76afb839
commit 0bc190e97e
5 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/NzbDrone.Common/Disk/DiskProviderBase.cs
View file

@ -32,6 +32,7 @@ public static StringComparison PathStringComparison
public abstract long? GetAvailableSpace(string path);
public abstract void InheritFolderPermissions(string filename);
public abstract void SetEveryonePermissions(string filename);
public abstract void SetFilePermissions(string path, string mask, string group);
public abstract void SetPermissions(string path, string mask, string group);
public abstract void CopyPermissions(string sourcePath, string targetPath);
public abstract long? GetTotalSize(string path);

1
src/NzbDrone.Common/Disk/IDiskProvider.cs
View file

@ -11,6 +11,7 @@ public interface IDiskProvider
long? GetAvailableSpace(string path);
void InheritFolderPermissions(string filename);
void SetEveryonePermissions(string filename);
void SetFilePermissions(string path, string mask, string group);
void SetPermissions(string path, string mask, string group);
void CopyPermissions(string sourcePath, string targetPath);
long? GetTotalSize(string path);

16
src/NzbDrone.Mono/Disk/DiskProvider.cs
View file

@ -66,10 +66,15 @@ public override void SetEveryonePermissions(string filename)
}
public override void SetFilePermissions(string path, string mask, string group)
{
var permissions = NativeConvert.FromOctalPermissionString(mask);
SetPermissions(path, mask, group, permissions);
}
public override void SetPermissions(string path, string mask, string group)
{
Logger.Debug("Setting permissions: {0} on {1}", mask, path);
var permissions = NativeConvert.FromOctalPermissionString(mask);
if (File.Exists(path))
@ -77,6 +82,13 @@ public override void SetPermissions(string path, string mask, string group)
permissions = GetFilePermissions(permissions);
}
SetPermissions(path, mask, group, permissions);
}
protected void SetPermissions(string path, string mask, string group, FilePermissions permissions)
{
Logger.Debug("Setting permissions: {0} on {1}", mask, path);
// Preserve non-access permissions
if (Syscall.stat(path, out var curStat) < 0)
{

2
src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs
View file

@ -135,7 +135,7 @@ public void Start(string installationFolder, int processId)
{
// Old MacOS App stores Sonarr binaries in MacOS together with shell script
// Make shim executable
_diskProvider.SetPermissions(shimPath, "755", null);
_diskProvider.SetFilePermissions(shimPath, "755", null);
}
}
}

5
src/NzbDrone.Windows/Disk/DiskProvider.cs
View file

@ -88,6 +88,11 @@ public override void SetEveryonePermissions(string filename)
}
public override void SetFilePermissions(string path, string mask, string group)
{
}
public override void SetPermissions(string path, string mask, string group)
{