diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js
index 3bf8d43b6..9cf1b7932 100644
--- a/frontend/src/Settings/General/UpdateSettings.js
+++ b/frontend/src/Settings/General/UpdateSettings.js
@@ -12,7 +12,6 @@ function UpdateSettings(props) {
const {
advancedSettings,
settings,
- isWindows,
packageUpdateMechanism,
onInputChange
} = props;
@@ -38,10 +37,10 @@ function UpdateSettings(props) {
value: titleCase(packageUpdateMechanism)
});
} else {
- updateOptions.push({ key: 'builtIn', value: 'Built-In' });
+ updateOptions.push({ key: 'builtIn', value: translate('BuiltIn') });
}
- updateOptions.push({ key: 'script', value: 'Script' });
+ updateOptions.push({ key: 'script', value: translate('Script') });
return (
);
}
diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
index 64eeb9169..7d859eb9d 100644
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs
@@ -7,6 +7,7 @@ using NzbDrone.Core.HealthCheck.Checks;
using NzbDrone.Core.Localization;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Update;
+using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.HealthCheck.Checks
{
@@ -21,28 +22,10 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
.Returns("Some Warning Message");
}
- [Test]
- public void should_return_error_when_app_folder_is_write_protected()
- {
- WindowsOnly();
-
- Mocker.GetMock()
- .Setup(s => s.StartUpFolder)
- .Returns(@"C:\NzbDrone");
-
- Mocker.GetMock()
- .Setup(c => c.FolderWritable(It.IsAny()))
- .Returns(false);
-
- Subject.Check().ShouldBeError();
- }
-
[Test]
public void should_return_error_when_app_folder_is_write_protected_and_update_automatically_is_enabled()
{
- PosixOnly();
-
- const string startupFolder = @"/opt/nzbdrone";
+ var startupFolder = @"C:\NzbDrone".AsOsAgnostic();
Mocker.GetMock()
.Setup(s => s.UpdateAutomatically)
@@ -62,10 +45,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
[Test]
public void should_return_error_when_ui_folder_is_write_protected_and_update_automatically_is_enabled()
{
- PosixOnly();
-
- const string startupFolder = @"/opt/nzbdrone";
- const string uiFolder = @"/opt/nzbdrone/UI";
+ var startupFolder = @"C:\NzbDrone".AsOsAgnostic();
+ var uiFolder = @"C:\NzbDrone\UI".AsOsAgnostic();
Mocker.GetMock()
.Setup(s => s.UpdateAutomatically)
@@ -89,7 +70,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
[Test]
public void should_not_return_error_when_app_folder_is_write_protected_and_external_script_enabled()
{
- PosixOnly();
+ var startupFolder = @"C:\NzbDrone".AsOsAgnostic();
Mocker.GetMock()
.Setup(s => s.UpdateAutomatically)
@@ -101,7 +82,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
Mocker.GetMock()
.Setup(s => s.StartUpFolder)
- .Returns(@"/opt/nzbdrone");
+ .Returns(startupFolder);
Mocker.GetMock()
.Verify(c => c.FolderWritable(It.IsAny()), Times.Never());
diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
index cd4bd7a11..7d7a8ea88 100644
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@@ -273,7 +273,7 @@ namespace NzbDrone.Core.Configuration
}
}
- public bool UpdateAutomatically => _updateOptions.Automatically ?? GetValueBoolean("UpdateAutomatically", false, false);
+ public bool UpdateAutomatically => _updateOptions.Automatically ?? GetValueBoolean("UpdateAutomatically", OsInfo.IsWindows, false);
public UpdateMechanism UpdateMechanism =>
Enum.TryParse(_updateOptions.Mechanism, out var enumValue)
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs
index 09b3eea1f..c723e1c4e 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
var startupFolder = _appFolderInfo.StartUpFolder;
var uiFolder = Path.Combine(startupFolder, "UI");
- if ((OsInfo.IsWindows || _configFileProvider.UpdateAutomatically) &&
+ if (_configFileProvider.UpdateAutomatically &&
_configFileProvider.UpdateMechanism == UpdateMechanism.BuiltIn &&
!_osInfo.IsDocker)
{
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 866b2f615..e8a897b39 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -105,6 +105,7 @@
"Branch": "Branch",
"BranchUpdate": "Branch to use to update {appName}",
"BranchUpdateMechanism": "Branch used by external update mechanism",
+ "BuiltIn": "Built-In",
"BypassProxyForLocalAddresses": "Bypass Proxy for Local Addresses",
"Cancel": "Cancel",
"CancelPendingTask": "Are you sure you want to cancel this pending task?",
@@ -601,6 +602,7 @@
"SaveChanges": "Save Changes",
"SaveSettings": "Save Settings",
"Scheduled": "Scheduled",
+ "Script": "Script",
"ScriptPath": "Script Path",
"Search": "Search",
"SearchAllIndexers": "Search all indexers",
diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs
index f1d299c11..971e1500f 100644
--- a/src/NzbDrone.Core/Update/InstallUpdateService.cs
+++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Update
{
EnsureAppDataSafety();
- if (OsInfo.IsWindows || _configFileProvider.UpdateMechanism != UpdateMechanism.Script)
+ if (_configFileProvider.UpdateMechanism != UpdateMechanism.Script)
{
var startupFolder = _appFolderInfo.StartUpFolder;
var uiFolder = Path.Combine(startupFolder, "UI");
@@ -143,7 +143,7 @@ namespace NzbDrone.Core.Update
_backupService.Backup(BackupType.Update);
- if (OsInfo.IsNotWindows && _configFileProvider.UpdateMechanism == UpdateMechanism.Script)
+ if (_configFileProvider.UpdateMechanism == UpdateMechanism.Script)
{
InstallUpdateWithScript(updateSandboxFolder);
return true;