From 9e7799981ba38943683d40b1e04d8a61cf98d430 Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 22 Oct 2020 20:53:22 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta15.1=20~=E6=96=B0=E5=A2=9E=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89http/sock5=E4=BB=A3=E7=90=86=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=8A=9F=E8=83=BD=20~=E6=96=B0=E5=A2=9E=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=AE=89=E8=A3=85=E5=86=85=E7=BD=AEyacd=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=20~=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89DNS?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=20~=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=20~=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86=E8=AE=BE=E5=A4=87=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E5=B1=80=E5=9F=9F=E7=BD=91=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5ip/mac=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8Diptables?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug=20~=E5=90=8C=E6=AD=A5=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=ACGeoip=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/clashfm.tar.gz | Bin 20665 -> 20643 bytes bin/version | 2 +- install.sh | 53 +++++++++++++++++++++++++++++++-------------- scripts/getdate.sh | 8 ++++--- scripts/start.sh | 1 - 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 70cd90dfbcc71cf84f2694972a008edd85a8323f..cc5bc0e13baf8a64028a889b1d27ab8be6c156c5 100644 GIT binary patch delta 9895 zcmV;YCRo|Ip#h_z0R|t72nd*fu?AHte{Wx2^Z$H4H!#rOn|I3R^8fSy%keS%-w~eL z)VA`}zUk8Lv8vj-twY`C2zSY(z8|1kHzt?&OJ~x>+ZApU3^2xXWc&0CE`)SPST38m zW83}tojZ3x?Tn)Jg9l(lSvz{Z_SZj-L*0Spqu;I^c^g`Bme0B6>%T76&+JFge>dQa zTK$C7+J+W{aE$jHR=U=Zh@q5kE5Qv#8$;qY0SQrjN9{x0}xj+l6T7$Ywf=dq>7+ zMvF$JWPT0m=y!ykx>{Den|qB3f#LPN`ra9ki#I`&+ufKf1#QcRwPM}230kGL9X?G^ zN77;vdU^Oa!FPn|jNv!pzo4~%5mI64-1inB?>@nZgpG)L(H#owe^49{kep^VSV9m4 zpjBO2T!hlq)WZ}Y&HeHhe`EZ~=Op;+1^DIpe_*(f+OS<^Cgbx`HjUV>N;6NowE#4d{76mAV(pC`Jba~evU#)ksJk2A~*_)#LH0tuXT<>`fHJ+0CEUN z!CRN3@M|zf;Wx&nbZ^5RogQzfd^vI=r5M>vK<2J^gi)??f6OQ^(yf0YU0>*&Od(Y` z^ZCWKTk;dSAErPIu|Klb3xW~x0(>!`)IgklK7zOlc2PTt?_iV%fk1O7II)}f){_d8 zrxMNG;|P~7(&f72UWCl^{NFDo_l-=TH-ymhE8 zia@U4*15_vPquBk)RS$OCHJJ6+ACvz)o2~KG#CWc99UZVhvV7F9mw#f#qSXeK3T#g z{p^?yKnJx@iN1NTEK81-W0DqdEZN{8#6K#SES_+d7Ei4F{z3i6AD7M@gb5S#@sZ_l z6T^w9e|{8UlubNz{J*mB157&^FA`?ZOBXy&2pHGcBocEpIQSPlPq_8aN0^KdQ%OY0 zoj2Z`lCuBuJ11A)+s~N}7)T@dH(d1(W7}ux#`b8}3n=}YL!QlZO?I9bw@u7t`wOKx z9L_i{&el0IjjcgPC5J5utxNI51}KL%I|Z{be>@s=ZBOyNXGjfg?HuapNvC0hs#F`r z_~n=XKon>UK5RqXeerc9DDl_t9J&sFh6a05DFfhV#_{K+7b~y)^ARLU3?76B7z*=Y z04~>Y;}{z3i~}6t^$cB`>$iY-JgxtD8uq|AOCmZmV4&nkd9;W%hN8)Ys~cu?_iMoY zf5jb-5KQFZ0!$A-p~VHPhC3S{vgFWH2I(2e&yF>Wl}fILGj`BKRlq z)D?_NOU%J^vU&sH`T&uWD&W=yhuWCsy_p!*%9(SP@U z`r^O)Pmo@rasiPq|M(>|R&3DWC5_RXQ||Vai|MkBiX=pKB0J;Sa~hN^t=Z@{@xCDw zRW{+m$aua|aWX)FnD=$#noAiF@{}bT47ji(g1BmfdlMr&xq$!=TXm9Ec5ybKfAZqC zn2Jf~7IZ}xd#*yVzXr2+&Jaltw|5@dkU6F8Om5NLsX4#uNII`AgLHmfEcds%6}FX9 zT?PImw~Xg9uSK1SPlTEvQg-Cm28AXKtVw`_eS}Y>x+G5RZ<)5p3vg;;SX4t-pK%{BhZQPL3(-7(txnj>qsq? zMi;#ho%RtR<0pEL*MB)*fBWnZ*E8zY-aZUyj6~qBGdDP%*G^mrjBPwzGya4Oy`f)D zJSPy4P6xpe426c}dn);4+Pm)NR%#&5zwxIyE+HlmJ8tny z@(8^TJeUAO3xtc~e}+nAeEv%d7(YJ>2?djmgzxb^5a^s3=BrRP`+Y))s!S;Ggr zv_NK|m&|Abl<>Fl?U%4R3HcZaK6VAuFXLI2c^yA>xr)-6f7<@!aGthPbwz5Y(OtOk zdv=U0_tYNh-8NtJ&qXMH2oy60N1vN---GVqpl|EdueV;kN8+)x+7^>vN`M3E0Wx4) zxH^Q_2C)rmHN2$wnM{Uxv|KEtPrAcu z#>7q?n%E2IiDDd>{6ukYK<0{t*ygM(6bn9OmtKLbR92gWWyBkiMhanZK)OK2iM(Z@ zy&~6J28vAH?(tq9jC`A|#)(6@(c)-!3ansKmq%&y>qnmHPhe!mlG3KMF1X~&L zhfd5CfBy(8cO$wE=#H{bs##xbEkf35`SSH3`>e@2u)BM44i}GHlqpEdh{mTOaRNIP zMysP@lDzZXW~YBOfHIKrp5#&wEdKIunT)32^-eM zbPRi5m>O(7`~gA}{`T%&WZ>9du$5$P*rW8pe{9Upk_DoHp7?CP{{=jFU^^s~Js&Ao zULY`}@Q#aAJF@7BybO7zRRD5c7-3UZ zziUa>%DXbZzj@DZ?>)d;?Y3g+L54^*dCzv+-Z3(MpUvXE#J=qt{z`-X`hh4{)NT=M ze@v$C-m%PD8g7Rua+&C=JvkL60Mdm6gV9*Kxn0uyMMk1i%cCckEBSlE!@}T6rtWoe zJg<{+c^xdOkE0`W>v!G_@}|f{y){P)s*24AKICKvGv^nbVe{K>wW~Yowxa{u!H=MS z$MG$dfSQqXOah9!k-|F8mW|E0TA*`>e+!_kyWa=cvo5`Y03l1EMtNxQ5WRA2eESjA z@oYQP@!@)+;~0cYfr|q68PIZ{xd%q3IVL`{~Z;DL9VG#aZ>Sw}CUS zo5u~0*(%LuyS$GfwI@0`45wQMa^;LySTv`HMvAZzOh061@v_s757`L6zFtCu;cI!(_H%Q>a`6kWhElk7>($;#t1k{2fjeD!U8^*9zkG>Lia z)&Q&S0ofjLU`Zr*czgNW5nD18e`4;0*&;nvDNcYRIY=`fJ-GSPy=ZoKFhrGfRQl}C zgtGPd8#sw(08@YiBP_KV)ssu~y&VT^k9g3-6FEt72q3X1?SES64>SdgaD(qE|JAhb z)Al^O!Uns?2z{{P2^k0ZhO>g0Y05URb}9!z2%KuP#E3LzWzEH!y@Pj^e~I?)9`RWo zdtl?(0}M`NY1VXW>@zi6n`knamix@t31+P;j5QqvUl(^YY0R+iy^s& z@EsrT04oJFEev1XFD0FfI~=Q{V=(v~wR0>OtDIBO;txVGrz0eD^7N*m+xHnbr^Uwi zk990Rx;5_N)B7>xS@m|Uf7Q4(Eh0C2oy)5I68fol{?zxlUD*|vH}%DhKWVqm)<(G% zNpKy5VRN=<+ri6R#2c1nC)-xdVmd^5jLl^DHY9z`W4bUIJ+XD*;7DW>8CG7ZQuyJc+x6M>?%$J#NBUyDR9vApm)6SQ8sao-zK)$8HPvv;xAn@;dW_uLY7ah*V>Ual zjK%yKTzLr7ke^{1`wYHNVbTXpjHuh_eb_kiMb!}=IREiOzbeD#oq)q0Q=JpR%Zb~^ z-W|_mZkiv7Mx2Qjf4n*Fi3hSl(l>m9SeJnYeL?4>#3w02Mdf6j_zpV|2X> zf>8ESNz1u8?`F=$WWE&$NOZeK5g(i0Mt~cOGP151uduQ4+}&fgcBPM7I5ttlnE3v2 zHr-}#W?u=mqOnYV`F<1c`F(o?SOaT2e^IMX`3xNf3`B9M3u2fP zLkzh(CLAD}@s7ZyUH>I;-*>dp0y>W@Rcf~oj5bBp%jw8p>*T*+R*JLjD0Pc9N~HQz zLzsu+6dcJM%ftC1TwMH&n-m;)zxy;Mbc0_5JIRE2sL4dfnWR2z#R()wC)DyTShE$2 zqDZhigQoOZfA`Dalu#8wF~@n!2I=cN?83&e`^?1ahboMMGh^|xMn_(@RbY6wHQx%A zbVcs4Kb0$%0q)2FF+v8gv5>)-E2YxyM*Ll;TIqJh*4Nb$`d{7{@1{y3g7zcGt5r(d z6S7x3OYH|hXpYq07lM+as219t1F~2hf^D}LX@oIge*}UY>qX0a(T_o@5A(&?a(~^9 zaXnUYc`*Hgux|@Ju!)p2ezt3adE+#W7>Z{C|AH*A6xQOgU4=cj-8agu^BBe znVHNWFPUb1b|Sv#YGAhSR&!`#GN-GF&rZcNddnB2Q!}l7;&taRnth|=oDy+3Bja{( z&hA3re=IPU^u-i~o&AtN&yZR|Gzi1CTpBYXR8$i_kWdfnA|&o=P?DQ7@^%UVG;WD5 zF9DLA1!j0y_5cSndTHQ7aCW#YA_k}=+PwDxq9RPZYj{|-aClhG&3}B4*tx2rhhoLH z$!B;ND4VuNg)hdCjPfpy2*FN_fnkdq0#aXgf2-2Z3C}%1QX9t}qt(%s7o2+mPP4SW zAMzbV#!JsQi+3@}Zgw;!0A0Vjee9FX`|so_Iu7V5h>~`nqZE_64}TM&9r)*L+a9shq~| zg|<9)tq7ZM03FK~bCc3eNVB=XM+{pr^xMpemSN3n7Lni03 z9)uP#1K)=Gk^7;h=lK$~&iZg)O!=?w**f+F2WKaSZ9nztnJ?fJx?C0qpB0P zU-}Xv?eX3 z7n9YUh=W8YN_C`Q!2@@MI&R~;2RV69#5AU-6zCdYjZc$jsvbuCesP1!;=n&2-JIjy zHE6jZiRol2g;ls-T`PNy;HU~<(gv~Pwp$AfN6g@yv=VkLRdR}Q=CC~m;|vU|A(H4`^cT=fkuDWE&f9xTR2o?{D(Z^K4c3> zKQx{_^nd(^zvH9sxpj&DfDN(<{xAqPKG0P~u33>e>wRW;#jf6Nl**C&T5iZe!4#%D zuC)#Fs{Gh*pL`FN%)74Se?;c)3yO)|+`cZvo*FVRHk1#8)MBadHobdT472i5tXz1T zDz}~F7C^+!Ihg&Zyy|JXQ3g8Z#P-O_C-1Q9jC^zfqBwj{%!%9YDzBA7|5bMO%IaEi zuGwA{%~Sd9B)5Qx^3UA*+09z5Lz6PMDz=9zvz6jxr^I5K5k5{sfAy9L^AIssE+&Ne zavELpb|&>SJ&BKvP&K<$IEzp! z%?G8MG!&Br7!=z^y@~Whx{xj;6N5Z^;9ddtlh`{co$9p?nL*8{$v}Z8wIx$4o(#9k zFr=vknT!UGj^{_mekCbD%voemD}Tkxrae7K!5cL2C*2`jJj7Xe*5Gdg0t^j&@d2p zl^}9&f4}@NZ9pk|@Z!e*S1{BSjIi$qb``^NY9+o}`y$I}mwYAk8a#NlUWCUCDucV( z+T9Gp6edOObf2SNe$lj!$|irJB*yx}FpY3Z9)K25`Ye0}ak)Dj?a@#97$=bSx7Qb& zZdy`k^AL@4*iicjDurN8rkn0jKQCFiT!d4Ce|u@R8u2J_W(uYNgD&AP_xqR0inv*h zbVWDH*iOjy2p^yF3;le?G{;6BL&e5&x@c|g$rf29fx$B@u>psXW1IJWHjcm1^07gx zB9`VFtyTtuTu-|Xu*+xk75+#vP+&b05fMvvJ9DHy-5A?l`hePK8EY=B%reW*3j>=WN2L9S6UA6FP9lTNVMzbg|)Gb ziG1xSrQeogYq<#wU2Lg`*v>&(o`rixzF>nc?EJrv`y2)t2I+cYc57 zg%}=h2FqY6wEAmB?AiK4w9*E~f9S%g+0-BIDR82JnWVk44w_E_)_>DUC~WITQ}{aN ziG5`f@I(M9@q5a{jv6V|`qFd~zYtJitz4b*gzG6Nf*njxPe+i}h8S$um z)i8If4FurVly`f%7R*=6Y~(1$5K5IPk3J^XWux7^Z2P)s{HoBJ%RiMB=vjg)a#faU zxaAvKaikW5N;L$p4KP!XVgRUI%K*$E6zCizwB8(#xWP@7u3eryOeaS@VVsKMARk8LKcsZTKe=n!w)e3rCGYC)WLj}|WO;So6;55VB3T~`7NL?eH03+`cbLU(P=fQ&#JHK z1nADIZYuetecc`lk#p-!A%->lZtNAAuGxB(@o38q~&AM3NdNp zF=@q^G`lSv4UuZF%Eq|^n{$)$Zc@Qb8h4Y5Zqgw)DGN%gFLk!UP0Pom6*|&Z+Crt7 zE#^(PW0JDDqA;M+e+9(3Pb;V_N5Mpsn)TXJvn-tUrEh94)!Vui4e+jV1IAg=^po&- zw61WC3Q{-L>$kM9drNLIQLWkf*uWlDhU% zOL)&`;qV3Y&KjI##$b-%EiEjSm0B)RwfJc^*3vb>`oZ49(U$2gObY1LvDiqXxA5I9 z^FTc^phcxdUHG`N;fc2}ywl_$PoP13Rq$fTm#!Q2%pMtBmaN<)bu1jn9vHu)aj4DS9(40KU* z4h+I49^Lm+G~pv17G{)B@mX_0)BqIOXRn3J4Ngqe{`jV4e45U!& zq#p`m1XHw5i=NE%A@B${JsS*3q0@bn3j~du z5wrute<4Jr9UCs;gwt~*`NJL2{IVICS2SfzzmzDD!feAHL`lR>I;YW?(p^z2+ygY0 zim${#0+36L*jAze+FTm>79H+^9IW$k$JzH!*mPMkooR+ z6hQ;{Qcft@ghBS2;awRv72~_w5}ddx_Mo)@OyCGN#4&Hq;2ZFXkU5V{c&Qt`nR70` zV&+Kq0@*#6!1}Z2B1M?Hj~CQ{^jzwYFi~cqT+fAQ*SyE7a=C))Q=#V~g-l!#m`{5v ze?bYmMUQ%Md-O~2H!R{Bb^*L1OQ%x!oeC`i@!hUMgxAte_kVx>^XJ5{TE6PFO1QEsEwCg|UUov2t$IqP+Ppp%(xo%!%v^HCn>q0c^Y+4h6q zZGHR@9UI30yr6d`-E(P|C$nXOywD=Rp?rY-tvmlNk`$wZC?(HY4l1?eh$~%m7aqFK z;=V`}JrbBxc~4@-p2^OsCLaFYIkw&qM&|wnM=rhM@_1tAE-bzPtBfx|f2oJz!X$?@ z0Yji*tE~pD<<67Sn>=PF7#wFJ4aNvI z7~TuD<1sK^hMk9%@M^0*e~nkzJzAchYX)m&u0XVU5XO15r=hnJp6RO#Ndq+9!w{bD z`DZ}QQ*TsmqwdE$vkc8q194EP7+Lparn6|woVpy|ccz5$UTKBk9Y=WbRku>LLUzh> zaU)b?6_5)9xnS+~Z}$<;1yl7z1dl&lIc56DxrZw!pFE->ybM*=f0I@?mE`q46oozl z$6QvfLM2>p_{oTu6kli`#rs%MHz3h*V%y zSf_mQj2>oMF~h_Y$GjLZNMgL}y8YH&+b=z@jh5+2Vf%-t5r%_guj2{1wT#Gxxszvw zZ@rwc2SHB9>7fgcf5b~CtEt!=G1XY)B&HF=Na+=x0sm>^B8!r+LKjUK%f!IZWpO|6 zT8tq==i$U0PN2k6Z26EdRsxC!yU|W)JpkAly>W(&@%x>3(Y!V>0JHe%ozR9MKUzXV zMksYu#Ik@(JU7cr);AnhEn5r(2UD zE^q9FTn5B60?44Vp5f+V;R+}UPnQWH7TosloU>!lOdIqFunU;IvvO9=`ct!b9rkg3 z*2jB8rr~hW@WWzKb5JYScU=h_^TaTVHktx!$HXFABOkVH60M~q)3KJ+dR|NP=nigu z@_05Qf{s7+f0|pbvzWxMCYW6Roh2n$l*=gRKd;c*ElUjO>%583aa&Y-fmMjR9=1)X zmm=Da#6XO}i0zk2hhkG#DC^83RMhH~-hA~8%gtr>Up7pc34IfHfR?W-Dc*~Mav974b?zx1~Qn|$p<`@S6kp;^)e|alWPUlvnyTm|b9?ATVZ9e`f zjkfGkG^dN58JW;}#2-=p1dP48^{8yra(2wIW-vV?0OY zXy7hte*;HJ7vButFzI&)Fz%_% zcZPQ&Omnt0)>ZNzTQEGa6PXqam&$xRPwP)WBC+F&7U#128Ai@5=aO(tCpGP$73O}KDNDCy|9 Z75_i~fBygc|M|~;{seL4k8l8N0RS|pMJWIP delta 9917 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 vD`J5z=Ef^FnRGSC4SfEX0BivO|GQWf diff --git a/bin/version b/bin/version index e640fc7..b1865dd 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ clash_v=1.2.0 clashpre_v=2020.10.09 GeoIP_v=20201021 -versionsh=1.0.0beta15.1 +versionsh=1.0.0beta15.2 diff --git a/install.sh b/install.sh index 5958784..f0b23f2 100644 --- a/install.sh +++ b/install.sh @@ -11,13 +11,19 @@ echo "** by Juewuy **" echo "***********************************************" #检查root权限 -[ "$USER" != "root" ] && [ "$USER" != "admin" ] && echo 请使用root用户执行安装!&& exit 1 +if [ "$USER" != "root" ];then + echo 当前用户:$USER + $echo "\033[31m请尽量使用root用户执行安装!\033[0m" + echo ----------------------------------------------- + read -p "仍要安装?可能会产生未知错误!(1/0) > " res + [ "$res" != "1" ] && exit +fi #检查更新 url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash" if [ "$test" -gt 0 ];then url="--resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubusercontent.com/juewuy/ShellClash/master" - [ "$test" -eq 2 ] && url="http://192.168.31.30:8080/clash-for-Miwifi" && echo $url + [ "$test" -eq 2 ] && url="http://192.168.31.30:8080/clash-for-Miwifi" [ "$test" -eq 3 ] && url="http://192.168.123.90:8080/clash-for-Miwifi" else release_new=$(curl -kfsSL --resolve api.github.com:443:140.82.113.5 "https://api.github.com/repos/juewuy/ShellClash/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') #检查版本 @@ -43,14 +49,13 @@ gettar(){ mv $clashdir/clashservice /etc/init.d/clash chmod 777 /etc/init.d/clash else - [ -d /etc/systemd/system/ ] && sysdir=/etc/systemd/system/ - [ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ + [ -w /etc/systemd/system ] && sysdir=/etc/systemd/system + [ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system if [ -n "$sysdir" ];then #设为systemd方式启动 mv $clashdir/clash.service $sysdir/clash.service sed -i "s%/etc/clash%$clashdir%g" $sysdir/clash.service systemctl daemon-reload - rm -rf /etc/init.d/clash else #设为保守模式启动 sed -i '/start_old=*/'d $clashdir/mark @@ -64,10 +69,12 @@ gettar(){ sed -i '/versionsh_l=*/'d $clashdir/mark sed -i "1i\versionsh_l=$release_new" $clashdir/mark #设置环境变量 - sed -i '/alias clash=*/'d /etc/profile - echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> /etc/profile #设置快捷命令环境变量 - sed -i '/export clashdir=*/'d /etc/profile - echo "export clashdir=\"$clashdir\"" >> /etc/profile #设置clash路径环境变量 + [ -w $HOME/.bashrc ] && profile=$HOME/.bashrc + [ -w /etc/profile ] && profile=/etc/profile + sed -i '/alias clash=*/'d $profile + echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> $profile #设置快捷命令环境变量 + sed -i '/export clashdir=*/'d $profile + echo "export clashdir=\"$clashdir\"" >> $profile #设置clash路径环境变量 #删除临时文件 rm -rf /tmp/clashfm.tar.gz rm -rf $clashdir/clashservice @@ -86,10 +93,13 @@ $echo "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理!!!\033 echo ----------------------------------------------- } setdir(){ -echo ----------------------------------------------- -$echo "\033[32m 1 在默认目录(/etc)安装" -$echo "\033[33m 2 手动设置安装目录" -$echo "\033[0m 0 退出安装" +echo ----------------------------------------------- +$echo "\033[33m安装ShellClash至少需要预留约10MB的磁盘空间\033[0m" +$echo " 1 在\033[32m/etc目录\033[0m下安装(适合路由设备)" +$echo " 2 在\033[32m/usr/share目录\033[0m下安装(适合大多数设备)" +$echo " 3 在\033[32m当前用户目录\033[0m下安装(适合非root用户)" +$echo " 4 手动设置安装目录" +$echo " 0 退出安装" echo ----------------------------------------------- read -p "请输入相应数字 > " num #设置目录 @@ -99,19 +109,27 @@ if [ -z $num ];then elif [ "$num" = "1" ];then dir=/etc elif [ "$num" = "2" ];then + dir=/usr/share +elif [ "$num" = "3" ];then + dir=$HOME/.local/share + mkdir -p $HOME/.config/systemd/user +elif [ "$num" = "4" ];then echo ----------------------------------------------- echo '可用路径 剩余空间:' - df -h | awk '{print $6,$2}'| sed 1d + df -h | awk '{print $6,$4}'| sed 1d echo '路径是必须带 / 的格式,写入虚拟内存(/tmp,/sys,..)的文件会在重启后消失!!!' read -p "请输入自定义路径 > " dir if [ -z "$dir" ];then - $echo "\033[31m路径错误!已取消安装!\033[0m" - exit; + $echo "\033[31m路径错误!请重新设置!\033[0m" + setdir fi else echo 安装已取消!!! exit; fi +echo 目标目录磁盘剩余:$(df -h $dir | awk '{print $4}' | sed 1d ) +read -p "确认安装?(1/0) > " res +[ "$res" != "1" ] && setdir clashdir=$dir/clash install } @@ -135,6 +153,9 @@ if [ -n "$clashdir" ];then echo ----------------------------------------------- $echo "\033[31m 旧版本文件已卸载!\033[0m" setdir + elif [ "$res" = "9" ];then + echo 测试模式,变更安装位置 + setdir else $echo "\033[31m输入错误!已取消安装!\033[0m" exit; diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 982a46e..72c3923 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -573,9 +573,11 @@ echo ----------------------------------------------- echo -e " 0 返回上级菜单" read -p "请输入对应数字 > " num if [ "$num" = '1' ]; then - echo 'function FindProxyForURL(url, host) {' > $dir/pac - echo " return \"SOCKS $authentication@$host:$mix_port; PROXY $authentication@$host:$mix_port; DIRECT;\"" >> $dir/pac - echo '}' >> $dir/pac + cat > $dir/pac <