mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-25 22:56:09 +03:00
Code Issues Projects Releases Wiki Activity

优化xz组件安装

Browse Source
This commit is contained in:
ProxySU 2020-11-24 16:19:23 +08:00
parent 21c9bf5176
commit ab9021e8a6
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProxySU/MainWindow.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySU" xmlns:local="clr-namespace:ProxySU"
mc:Ignorable="d" 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://yq.aliyun.com/articles/331878
https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview--> https://docs.microsoft.co/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
<Window.Resources> <Window.Resources>

10
ProxySU/MainWindow.xaml.cs
View File

@ -7953,12 +7953,18 @@ namespace ProxySU
} }
//处理极其少见的xz-utils未安装的情况 //处理极其少见的xz-utils未安装的情况
if (string.IsNullOrEmpty(client.RunCommand("command -v xz-utils").Result) == true)
if (getApt == true)
{ {
sshShellCommand = $"{sshCmdInstall}xz-utils"; sshShellCommand = $"{sshCmdInstall}xz-utils";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand); currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
} }
else if (getDnf == true || getYum == true)
{
sshShellCommand = $"{sshCmdInstall}xz-devel";
currentShellCommandResult = MainWindowsShowCmd(client, sshShellCommand);
}
//检测是否安装lsof //检测是否安装lsof
if (string.IsNullOrEmpty(client.RunCommand("command -v lsof").Result) == true) if (string.IsNullOrEmpty(client.RunCommand("command -v lsof").Result) == true)
{ {

4
ProxySU/Properties/AssemblyInfo.cs
View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.24.0")] [assembly: AssemblyVersion("2.4.25.0")]
[assembly: AssemblyFileVersion("2.4.24.0")] [assembly: AssemblyFileVersion("2.4.25.0")]

2
ProxySU/SSpluginWindow.xaml
View File

@ -39,7 +39,7 @@
<RowDefinition></RowDefinition> <RowDefinition></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<GroupBox Header="{DynamicResource GroupBoxHeaderV2RayTemplates}" Grid.Row="0" Grid.RowSpan="3"> <GroupBox Header="{DynamicResource ButtonTemplateConfigurationSS}" Grid.Row="0" Grid.RowSpan="3">
<Grid> <Grid>
<TabControl x:Name="TabControlTemplate"> <TabControl x:Name="TabControlTemplate">
<TabItem Header="{DynamicResource TabItemHeaderV2RayHotPlan}" Width="110" Height="30"> <TabItem Header="{DynamicResource TabItemHeaderV2RayHotPlan}" Width="110" Height="30">

BIN
ProxySU/bin/Beta/Beta.zip
View File

Binary file not shown.