.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -3,13 +3,6 @@ description: 在提出问题前请先自行排除服务器端问题和升级到
 title: "[Bug]: "
 labels: ["bug"]
 body:
-  - type: input
-    id: "os-version"
-    attributes:
-      label: "操作系统和版本"
-      description: "操作系统和版本"
-    validations:
-      required: true
   - type: input
     id: "expectation"
     attributes:

v2rayN/ServiceLib/Common/Utils.cs

@@ -857,7 +857,7 @@ namespace ServiceLib.Common
         private static async Task<string?> GetLinuxUserId()
         {
             var arg = new List<string>() { "-c", "id -u" };
-            return await GetCliWrapOutput(Global.LinuxBash, arg);
+            return await GetCliWrapOutput("/bin/bash", arg);
         }
 
         public static async Task<string?> SetLinuxChmod(string? fileName)
@@ -868,14 +868,14 @@ namespace ServiceLib.Common
                 fileName = fileName.AppendQuotes();
             //File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
             var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
-            return await GetCliWrapOutput(Global.LinuxBash, arg);
+            return await GetCliWrapOutput("/bin/bash", arg);
         }
 
         public static async Task<string?> GetLinuxFontFamily(string lang)
         {
             // var arg = new List<string>() { "-c", $"fc-list :lang={lang} family" };
             var arg = new List<string>() { "-c", $"fc-list : family" };
-            return await GetCliWrapOutput(Global.LinuxBash, arg);
+            return await GetCliWrapOutput("/bin/bash", arg);
         }
 
         public static string? GetHomePath()
@@ -888,7 +888,7 @@ namespace ServiceLib.Common
         public static async Task<string?> GetListNetworkServices()
         {
             var arg = new List<string>() { "-c", $"networksetup -listallnetworkservices" };
-            return await GetCliWrapOutput(Global.LinuxBash, arg);
+            return await GetCliWrapOutput("/bin/bash", arg);
         }
 
         #endregion Platform

v2rayN/ServiceLib/Global.cs

@@ -71,7 +71,6 @@ namespace ServiceLib
         public const string V2RayLocalAsset = "V2RAY_LOCATION_ASSET";
         public const string XrayLocalAsset = "XRAY_LOCATION_ASSET";
         public const int SpeedTestPageSize = 1000;
-        public const string LinuxBash = "/bin/bash";
 
         public static readonly List<string> IEProxyProtocols =
         [

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -177,7 +177,7 @@ namespace ServiceLib.Handler
                 if (File.Exists(launchAgentPath))
                 {
                     var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
-                    await Utils.GetCliWrapOutput(Global.LinuxBash, args);
+                    await Utils.GetCliWrapOutput("/bin/bash", args);
 
                     File.Delete(launchAgentPath);
                 }
@@ -197,7 +197,7 @@ namespace ServiceLib.Handler
                 await File.WriteAllTextAsync(launchAgentPath, plistContent);
 
                 var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
-                await Utils.GetCliWrapOutput(Global.LinuxBash, args);
+                await Utils.GetCliWrapOutput("/bin/bash", args);
             }
             catch (Exception ex)
             {

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -380,7 +380,7 @@ namespace ServiceLib.Handler
         private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
         {
             //Shell scripts
-            var shFilePath = Utils.GetBinConfigPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
+            var shFilePath = Utils.GetBinPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
             File.Delete(shFilePath);
             var sb = new StringBuilder();
             sb.AppendLine("#!/bin/sh");

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -116,7 +116,7 @@ namespace ServiceLib.Services.CoreConfig
                 //enable tun mode
                 if (_config.TunModeItem.EnableTun)
                 {
-                    var tun = EmbedUtils.GetEmbedText(Global.ClashTunYaml);
+                    string tun = EmbedUtils.GetEmbedText(Global.ClashTunYaml);
                     if (Utils.IsNotEmpty(tun))
                     {
                         var tunContent = YamlUtils.FromYaml<Dictionary<string, object>>(tun);

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -336,19 +336,21 @@ namespace ServiceLib.Services
                     ipAddress = ipHostInfo.AddressList.First();
                 }
 
+                var timer = Stopwatch.StartNew();
+
                 IPEndPoint endPoint = new(ipAddress, port);
                 using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
-                var timer = Stopwatch.StartNew();
                 var result = clientSocket.BeginConnect(endPoint, null, null);
                 if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
                 {
                     throw new TimeoutException("connect timeout (5s): " + url);
                 }
-                timer.Stop();
-                responseTime = (int)timer.Elapsed.TotalMilliseconds;
 
                 clientSocket.EndConnect(result);
+
+                timer.Stop();
+                responseTime = (int)timer.Elapsed.TotalMilliseconds;
             }
             catch (Exception ex)
             {