优化acme.sh的使用与卸载

proxysu · Oct 31, 2020 · b491fe1 · b491fe1
1 parent 35b6a74
commit b491fe1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs
@@ -5993,7 +5993,7 @@ private void StartRemoveProxySoft(ConnectionInfo connectionInfo)
                            + "acme.sh......";
                         MainWindowsShowInfo(currentStatus);
 
-                        sshShellCommand = @"acme.sh --uninstall";
+                        sshShellCommand = @"/root/.acme.sh/acme.sh --uninstall";
                         currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
 
                         sshShellCommand = @"rm -r  ~/.acme.sh";
@@ -6010,6 +6010,9 @@ private void StartRemoveProxySoft(ConnectionInfo connectionInfo)
                         }
                         else
                         {
+                            sshShellCommand = @"sed -i 's/. ""/root/.acme.sh/acme.sh.env""//g' /root/.bashrc";
+                            currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
+
                             //******"acme.sh卸载成功！"******
                             SetUpProgressBarProcessing(46);
                             currentStatus = "acme.sh" + Application.Current.FindResource("DisplayInstallInfo_RemoveProxySoftSuccess").ToString();
@@ -8087,11 +8090,11 @@ private bool AcmeShInstall(SshClient client)
                 return false;
             }
 
-            //sshShellCommand = @"cd ~/.acme.sh/";
-            //currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
+            sshShellCommand = @"cd ~/.acme.sh/";
+            currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
 
-            //sshShellCommand = @"alias acme.sh=~/.acme.sh/acme.sh";
-            //currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
+            sshShellCommand = @"alias acme.sh=~/.acme.sh/acme.sh";
+            currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
 
             //****** "申请域名证书......" ******24
             SetUpProgressBarProcessing(55);

diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip