Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 21:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add linux bash param

Browse source
This commit is contained in:
2dust 2025-02-23 16:59:22 +08:00
parent aa133bb50b
commit 2f3e409487
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
v2rayN/ServiceLib/Common/Utils.cs
View file

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

1
v2rayN/ServiceLib/Global.cs
View file

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

4
v2rayN/ServiceLib/Handler/AutoStartupHandler.cs
View file

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

2
v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs
View file

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