From 56dff5ed4f3bc0eb20b16944ff9a838a54384114 Mon Sep 17 00:00:00 2001 From: ProxySU Date: Sat, 31 Oct 2020 23:44:28 +0800 Subject: [PATCH] =?UTF-8?q?Caddy=E5=AE=89=E8=A3=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProxySU/MainWindow.xaml.cs | 49 ++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index b844f70..940cedf 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -8336,27 +8336,46 @@ namespace ProxySU //if (!currentShellCommandResult.Contains("/usr/bin/caddy")) //if (currentShellCommandResult.Trim().Equals("0") == true) functionResult = FileCheckExists(client, @"/usr/bin/caddy"); - if (functionResult == false) + if (functionResult == true) { - //****** "安装Caddy失败！" ****** - MessageBox.Show(Application.Current.FindResource("DisplayInstallInfo_ErrorInstallCaddyFail").ToString()); - //****** "安装Caddy失败！" ****** - currentStatus = Application.Current.FindResource("DisplayInstallInfo_ErrorInstallCaddyFail").ToString(); + //****** "Caddy安装成功！" ******29 + SetUpProgressBarProcessing(66); + currentStatus = Application.Current.FindResource("DisplayInstallInfo_InstalledCaddyOK").ToString(); MainWindowsShowInfo(currentStatus); - //client.Disconnect(); - return false; + + sshShellCommand = @"systemctl enable caddy"; + currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); + + return true; + } - //****** "Caddy安装成功！" ******29 - SetUpProgressBarProcessing(66); - currentStatus = Application.Current.FindResource("DisplayInstallInfo_InstalledCaddyOK").ToString(); + functionResult = ProxySoftInstall(client, @"Caddy", @"https://raw.githubusercontent.com/proxysu/shellscript/master/Caddy-Naive/caddy-naive-install.sh"); + //if (functionResult == false) { FunctionResultErr(); client.Disconnect(); return false; } + + functionResult = FileCheckExists(client, @"/usr/bin/caddy"); + if (functionResult == true) + { + //****** "Caddy安装成功！" ******29 + SetUpProgressBarProcessing(66); + currentStatus = Application.Current.FindResource("DisplayInstallInfo_InstalledCaddyOK").ToString(); + MainWindowsShowInfo(currentStatus); + + + sshShellCommand = @"systemctl enable caddy"; + currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); + + return true; + } + + //****** "安装Caddy失败！" ****** + MessageBox.Show(Application.Current.FindResource("DisplayInstallInfo_ErrorInstallCaddyFail").ToString()); + //****** "安装Caddy失败！" ****** + currentStatus = Application.Current.FindResource("DisplayInstallInfo_ErrorInstallCaddyFail").ToString(); MainWindowsShowInfo(currentStatus); - - sshShellCommand = @"systemctl enable caddy"; - currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); - - return true; + //client.Disconnect(); + return false; }