命令多显示了\

zhiyuanFan · Oct 16, 2022 · 9002127 · 9002127
1 parent 4245787
commit 9002127
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/ST.Client.Desktop.Mac/Services/Implementation/MacPlatformServiceImpl.cs b/src/ST.Client.Desktop.Mac/Services/Implementation/MacPlatformServiceImpl.cs
@@ -91,14 +91,14 @@ internal static bool IsCertificateInstalled(X509Certificate2 certificate2)
 
         async ValueTask<bool?> IPlatformService.TrustRootCertificate(string filePath)
         {
-            var script = $"security add-trusted-cert -d -r trustRoot -k /Users/{Environment.UserName}/Library/Keychains/login.keychain-db \\\"{filePath}\\\"";
+            var script = $"security add-trusted-cert -d -r trustRoot -k /Users/{Environment.UserName}/Library/Keychains/login.keychain-db";
             TextBoxWindowViewModel vm = new()
             {
                 Title = AppResources.MacTrustRootCertificateTips,
-                InputType = TextBoxWindowViewModel.TextBoxInputType.ReadOnlyText,
-                Description = AppResources.MacSudoPasswordTips + $"\r\n sudo {script}",
+                InputType = TextBoxWindowViewModel.TextBoxInputType.TextBox,
+                Description = AppResources.MacSudoPasswordTips + $"\r\n sudo {script} \"{filePath}\"",
             };
-            var scriptContent = $"osascript -e 'tell app \"Terminal\" to do script \"sudo -S {script}\"'";
+            var scriptContent = $"osascript -e 'tell app \"Terminal\" to do script \"sudo -S {script} \\\"{filePath}\\\"\"'";
             var msg = UnixHelper.RunShell(scriptContent.ToString());
             if (await TextBoxWindowViewModel.ShowDialogAsync(vm) == null)
                 return null;