mirror of
https://github.com/proxysu/ProxySU.git
synced 2024-11-25 06:36:08 +03:00
优化xz组件安装
This commit is contained in:
parent
21c9bf5176
commit
ab9021e8a6
@ -5,7 +5,7 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:ProxySU"
|
||||
mc:Ignorable="d"
|
||||
Title="ProxySU - v2.4.24" Height="675" Width="650">
|
||||
Title="ProxySU - v2.4.25 Beta2" Height="675" Width="650">
|
||||
<!--以下样式参考自:https://yq.aliyun.com/articles/331878
|
||||
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
|
||||
<Window.Resources>
|
||||
|
@ -7953,12 +7953,18 @@ namespace ProxySU
|
||||
|
||||
}
|
||||
//处理极其少见的xz-utils未安装的情况
|
||||
if (string.IsNullOrEmpty(client.RunCommand("command -v xz-utils").Result) == true)
|
||||
|
||||
if (getApt == true)
|
||||
{
|
||||
sshShellCommand = $"{sshCmdInstall}xz-utils";
|
||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||
|
||||
}
|
||||
else if (getDnf == true || getYum == true)
|
||||
{
|
||||
sshShellCommand = $"{sshCmdInstall}xz-devel";
|
||||
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
|
||||
}
|
||||
|
||||
//检测是否安装lsof
|
||||
if (string.IsNullOrEmpty(client.RunCommand("command -v lsof").Result) == true)
|
||||
{
|
||||
|
@ -51,5 +51,5 @@ using System.Windows;
|
||||
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
|
||||
// 方法是按如下所示使用“*”: :
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("2.4.24.0")]
|
||||
[assembly: AssemblyFileVersion("2.4.24.0")]
|
||||
[assembly: AssemblyVersion("2.4.25.0")]
|
||||
[assembly: AssemblyFileVersion("2.4.25.0")]
|
||||
|
@ -39,7 +39,7 @@
|
||||
<RowDefinition></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<GroupBox Header="{DynamicResource GroupBoxHeaderV2RayTemplates}" Grid.Row="0" Grid.RowSpan="3">
|
||||
<GroupBox Header="{DynamicResource ButtonTemplateConfigurationSS}" Grid.Row="0" Grid.RowSpan="3">
|
||||
<Grid>
|
||||
<TabControl x:Name="TabControlTemplate">
|
||||
<TabItem Header="{DynamicResource TabItemHeaderV2RayHotPlan}" Width="110" Height="30">
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user