From 2f0f9fb09d3153738920c94fc66d484eb1c22d45 Mon Sep 17 00:00:00 2001 From: autumn Date: Tue, 29 Jun 2021 16:08:45 +0800 Subject: [PATCH] merge --- ProxySuper.Core/ProxySuper.Core.csproj | 1 + ProxySuper.Core/Services/ProjectBase.cs | 7 + .../Controls/XraySettingsControl.xaml | 272 ++++++++++-------- ProxySuper.WPF/Resources/Languages/en.xaml | 2 + ProxySuper.WPF/Resources/Languages/tw_cn.xaml | 2 + ProxySuper.WPF/Resources/Languages/zh_cn.xaml | 2 + 6 files changed, 161 insertions(+), 125 deletions(-) diff --git a/ProxySuper.Core/ProxySuper.Core.csproj b/ProxySuper.Core/ProxySuper.Core.csproj index db1bc85..ef51069 100644 --- a/ProxySuper.Core/ProxySuper.Core.csproj +++ b/ProxySuper.Core/ProxySuper.Core.csproj @@ -67,6 +67,7 @@ + diff --git a/ProxySuper.Core/Services/ProjectBase.cs b/ProxySuper.Core/Services/ProjectBase.cs index aaa5eb3..9563c58 100644 --- a/ProxySuper.Core/Services/ProjectBase.cs +++ b/ProxySuper.Core/Services/ProjectBase.cs @@ -215,6 +215,13 @@ namespace ProxySuper.Core.Services RunCmd(GetInstallCmd("xz-devel")); } + // 检测是否安装cron + cmd = RunCmd("command -v cron"); + if (string.IsNullOrEmpty(cmd)) + { + RunCmd(GetInstallCmd("cron")); + } + // 检测是否安装lsof cmd = RunCmd("command -v lsof"); if (string.IsNullOrEmpty(cmd)) diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml index 4be4fad..d9e9b48 100644 --- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml +++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml @@ -10,165 +10,165 @@ - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + -