From c464bd6e68e431b2f3fb33f99fa49914211f137a Mon Sep 17 00:00:00 2001 From: ProxySU Date: Fri, 20 Mar 2020 22:49:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=89=E8=A3=85=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProxySU/MainWindow.xaml.cs | 26 +++++++++++++++----------- ProxySU/bin/Release/ProxySU.exe | Bin 68096 -> 68096 bytes 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index ac222c4..40450d0 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -388,12 +388,12 @@ namespace ProxySU { currentStatus = "主机登录成功"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); - Thread.Sleep(2000); + Thread.Sleep(1000); } //检测远程主机系统环境是否符合要求 currentStatus = "检测系统是否符合安装要求......"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); - Thread.Sleep(2000); + Thread.Sleep(1000); var result = client.RunCommand("uname -r"); //var result = client.RunCommand("cat /root/test.ver"); @@ -405,7 +405,7 @@ namespace ProxySU MessageBox.Show($"当前系统内核版本为{linuxKernelVerStr[0]}，V2ray要求内核为2.6.23及以上。请升级内核再安装！"); currentStatus = "系统内核版本不符合要求，安装失败！！"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); - Thread.Sleep(2000); + Thread.Sleep(1000); } //检测系统是否支持yum 或 apt-get或zypper，且支持Systemd @@ -422,14 +422,14 @@ namespace ProxySU MessageBox.Show($"系统缺乏必要的安装组件如:apt-get||yum||zypper||Syetemd，主机系统推荐使用：CentOS 7/8,Debian 8/9/10,Ubuntu 16.04及以上版本"); currentStatus = "系统环境不满足要求，安装失败！！"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); - Thread.Sleep(2000); + Thread.Sleep(1000); return; } else { currentStatus = "符合安装要求,布署中......"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); - Thread.Sleep(2000); + //Thread.Sleep(2000); } //在相应系统内安装curl(如果没有安装curl) if (string.IsNullOrEmpty(client.RunCommand("command -v curl").Result) == true) @@ -454,18 +454,22 @@ namespace ProxySU //下载官方安装脚本安装 - + //string installResult =client.RunCommand("echo 999999").Result.ToString(); client.RunCommand("curl -o /tmp/go.sh https://install.direct/go.sh"); - string installResult= client.RunCommand("bash /tmp/go.sh").ToString(); - client.RunCommand("mv /etc/v2ray/config.json /etc/v2ray/config.json.1"); - if (!installResult.Contains("installed")) + client.RunCommand("bash /tmp/go.sh"); + string installResult = client.RunCommand("find / -name v2ray").Result.ToString(); + //string installResult = client.RunCommand("bash /tmp/go.sh").Result; + //installResult = installResult.Substring(0, installResult.Length - 1); + MessageBox.Show(installResult); + if (!installResult.Contains("/usr/bin/v2ray")) { - MessageBox.Show("安装V2ray失败(官方脚本go.sh运行出错！)"); + MessageBox.Show("安装V2ray失败(官方脚本go.sh运行出错！"); client.Disconnect(); - currentStatus = "安装V2ray失败(官方脚本go.sh运行出错！)"; + currentStatus = "安装V2ray失败(官方脚本go.sh运行出错！"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); return; } + client.RunCommand("mv /etc/v2ray/config.json /etc/v2ray/config.json.1"); //client.RunCommand("mkdir /etc/v2ray"); //上传配置文件 diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe index 54088d148d72882dfddd94f6fa159e7cab5950e4..110f82a09b9a2ecdb2a87026e010d8a0ac5817e3 100644 GIT binary patch delta 1221 zcmZ{kT}V_x6vzK_ceUH@x~;jj>wZY9Y3t{1o0VCXrI}x3rIJ=qSy@@Ra{Hj5Pzxj? z&~=s~Un=UMtcP*~17o3xs0Tp^ghHi2LVWQd>_H+rb9XliZD3~3@BGi4duHa|+Y!`u z1hqZawOgG91A&_kwkPm-uMwYt8c_QJoG1^tk_^QR2I2#sfCB#fcn)u5t5^f?WbLke z3Kp%Lx`a54Yyr;s07jeu#FvI#(#Iq=&S#gMlcqHM)bd<0^(}7`lfiOdKcxZOI|1Fe zlfSgM`LyL~QHHFH$Y}FZ89M(iF*s;QcYA2eP<{w$51F|e74u@WMclH#mR#iEVN0rc ze5nM;N*T#&mJH>o5OUfjjZy1Pp~_@sRIFV>rln8$CG6dlAQCMrK3!C_E+FoUiOCCy zS7V}mo~VSGj;hGz_mWde-cy{qjT}d!?5`KakBX(~WJR`A5T;X%X%79o@M6wvc5}lY zAvqR%gL`dObN_r{gdeb3eRJ~#qv4+?XX}+p;fWl0ok5(bX98JN&(?f#)4&Gm*XZtE zQP+_jYjpVtlJ6a#wdKf7l*MB9H}I$SWJ?dhBK0c&+N9FQ8|`JRiQluQ|2JaHUc{bp zn_tUep;*_z4oMGPTNMn<{*YTZAhq|2o8s_DzT_0_y>BUT|uZ1=b zFj2K>JL)S+X*TDDQc?@!+f8C?=tPU$E9D^=rD`HC%!LuHP1h&+@K&V&?&v457MnLl zw3WJp(mGT}sf?%q7ghSk)+ENG5RX*)%34gRL>~HP=q#;S#&~SP`X&{*+@0`H+Jqxf z>Wb?pYKc;B+%qCYrCaiA)1Xv@ODc7#X^POPQo!mpHj{SyAMI{vL*|TYdwMfYq7_H6 z0v_tQWFN*E93%Szd{BrkfjK=mkF!J`G^z2Pzf`Q|530P3ad%a7XtXM6rDJgYUc9dwYBpUoD q`H7*11b6hmB9?69!$Wo{|8r=1Xp)7D;kgQ_u5d6>W-~0{UGy7V-vgTf delta 1148 zcmZ{kO-vI}5Xa|jzt&Pp3x&4qswtI^mKG5Z5sE@W5Tr^Jh=@ibQRFKYSGXY*Kady# zlt+m6Ch>rf5Mqs(KoAaIj8PK2aDYHUj4?)HL=Wh}*=?Js;M=^s`OSZ3cJ{s9^$y9s zL-K(h`LCynabGV_qJ2-!Xy=vy$^pkJKz)hN5~C>~ph4zQ$e~}aI_O!FOiZ+kbXqpi zCyo-F3@BjkC_qsL06~rfP|5=qW-*4mqu*m&nFSSXigSvKKdwbwG{#5z1r9?6I!af~oZ-uMA(}?Ta|U}vIKv#yI8Tqnn=Z6(7e>&Pl88lvdy#r5 zobhIR?CL+U5dyElY-tmPB#pRz&K0mjVU~E90Ecn5;h{|6RHGdpc)rk$z86%%IoK?$ zVKjKE=?rH!)*`5+gZrZ?p_w*t#UzVPa*6+q_{`;#Thz|mQirfcaKl)+(Q^*(ZC3~r zJ2?kv2X7_M=?MRg%mjvakI4u_3oVQBE`0Z_RTc2w382Gnt;ecLi*Q|c2GSC8m7UU~ zK^HW#gG?IS5g!!Ejg$`Z+#t26{Y(ZtlgI}TBUa!bq~!&*ed>!$Hn>7mjFbcQ5`7?< zdL`t-1Bup1qb>nyFMbvPw@r4f5?qj6DSALW;2PY3R=5PscwK?Z0Gae=S-Q*y zBw%pQ%5*<$Kj(d<=0s28{q9%!s<(ml^7f|Kt>WG}v2F2HXvSHI-+Co&o3`p!U*?SK zUn|{r*}lF{N?jfuovx1j82S}RDKv71V>Xup_L+4;y`u#I?d(=5W5}J-vt)z#(pA3! Dd&~AD