Fix Shell Run

Mossimos · Mossimos · commit 8061e3682970 · 2021-12-09T21:17:54.000+08:00
diff --git a/src/ST.Client.Desktop.Linux/Services/Implementation/LinuxPlatformServiceImpl.cs b/src/ST.Client.Desktop.Linux/Services/Implementation/LinuxPlatformServiceImpl.cs
@@ -185,7 +185,7 @@ public async void SystemHibernate(int waitSecond = 30)
             await Task.Delay(waitSecond);
             RunShell($"echo \"{SystemUserPassword}\" | sudo sh -c \" echo disk > /sys/pwoer/state\"");
         }
-        private string RunShell(string shell, bool isAdmin = false)
+        private string RunShell(string shell)
         {
             try
             {
@@ -226,7 +226,7 @@ public async void TryGetSystemUserPassword(sbyte retry_count = 4)
                 var pwd = await TextBoxWindowViewModel.ShowDialogAsync(vm);
                 if (!string.IsNullOrWhiteSpace(pwd))
                 { 
-                    if (!string.IsNullOrWhiteSpace(RunShell($"echo \"{pwd}\" | sudo -S sh -c \"sudo -n true\"", true)))
+                    if (!string.IsNullOrWhiteSpace(RunShell($"echo \"{pwd}\" | sudo -S sh -c \"sudo -n true\"")))
                     {
                         SystemUserPassword = pwd;
                     }
diff --git a/src/ST.Client.Desktop.Mac/Internals/UnixHelper.RunShellAsync.cs b/src/ST.Client.Desktop.Mac/Internals/UnixHelper.RunShellAsync.cs
@@ -98,15 +98,19 @@ public static string RunShell(string shell)
         try
         {
             using var p = new Process();
-            p.StartInfo.FileName = BinBash;
-            p.StartInfo.Arguments = shell;
+            p.StartInfo.FileName = UnixHelper.BinBash;
+            p.StartInfo.Arguments = "";
             p.StartInfo.RedirectStandardOutput = true;
+            p.StartInfo.RedirectStandardInput = true;
             p.StartInfo.UseShellExecute = false;
-            p.StartInfo.CreateNoWindow = true;
             p.Start();
+            p.StandardInput.WriteLine(shell);
+            p.StandardInput.Close();
             string result = p.StandardOutput.ReadToEnd();
+            p.StandardOutput.Close();
             p.WaitForExit();
             p.Close();
+            p.Dispose();
             return result;
         }
         catch (Exception e)

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public async void SystemHibernate(int waitSecond = 30)`
`185`	`185`	`await Task.Delay(waitSecond);`
`186`	`186`	`RunShell($"echo \"{SystemUserPassword}\" \| sudo sh -c \" echo disk > /sys/pwoer/state\"");`
`187`	`187`	`}`
`188`		`- private string RunShell(string shell, bool isAdmin = false)`
	`188`	`+ private string RunShell(string shell)`
`189`	`189`	`{`
`190`	`190`	`try`
`191`	`191`	`{`
`@@ -226,7 +226,7 @@ public async void TryGetSystemUserPassword(sbyte retry_count = 4)`
`226`	`226`	`var pwd = await TextBoxWindowViewModel.ShowDialogAsync(vm);`
`227`	`227`	`if (!string.IsNullOrWhiteSpace(pwd))`
`228`	`228`	`{`
`229`		`- if (!string.IsNullOrWhiteSpace(RunShell($"echo \"{pwd}\" \| sudo -S sh -c \"sudo -n true\"", true)))`
	`229`	`+ if (!string.IsNullOrWhiteSpace(RunShell($"echo \"{pwd}\" \| sudo -S sh -c \"sudo -n true\"")))`
`230`	`230`	`{`
`231`	`231`	`SystemUserPassword = pwd;`
`232`	`232`	`}`