Merge branch 'master' of https://github.com/juewuy/ShellClash into master

README.md

@@ -1,15 +1,12 @@
 <h1 align="center">
-  <img src="https://github.com/Dreamacro/clash/raw/master/docs/logo.png" alt="Clash" width="200">
+  <br>ShellCrash<br>
-  <br>ShellClash<br>
 </h1>
 
 
   <p align="center">
-	<a target="_blank" href="https://github.com/Dreamacro/clash/releases">
+
-    <img src="https://img.shields.io/github/release/Dreamacro/Clash.svg?style=flat-square&label=Clash">
+  <a target="_blank" href="https://github.com/juewuy/ShellCrash/releases">
-  </a>
+    <img src="https://img.shields.io/github/release/juewuy/ShellCrash.svg?style=flat-square&label=ShellCrash&colorB=green">
-  <a target="_blank" href="https://github.com/juewuy/ShellClash/releases">
-    <img src="https://img.shields.io/github/release/juewuy/ShellClash.svg?style=flat-square&label=ShellClash&colorB=green">
   </a>
 </p>
 
@@ -17,7 +14,7 @@
 
 ## Function introduction: 
 
-~Convenient use in Shell environment through management script [Clash](https://github.com/Dreamacro/clash)<br>~Support management of [Clash functions](https://lancellc.gitbook.io/clash)<br>~Support online import [Clash](https://github.com/Dreamacro/clash) supports sharing, subscription and configuration links<br>~Support configuration timing tasks, support configuration file timing updates<br>~Support online installation and Use local web panel to manage built-in rules<br>~Support routing mode, native mode and other mode switching<br>~Support online update<br>
+~Convenient use in Shell environment through management script [Crash](https://github.com/Dreamacro/Crash)<br>~Support management of [Crash functions](https://lancellc.gitbook.io/Crash)<br>~Support online import [Crash](https://github.com/Dreamacro/Crash) supports sharing, subscription and configuration links<br>~Support configuration timing tasks, support configuration file timing updates<br>~Support online installation and Use local web panel to manage built-in rules<br>~Support routing mode, native mode and other mode switching<br>~Support online update<br>
 
 ## Equipment support:
 

README_CN.md

@@ -1,15 +1,15 @@
 <h1 align="center">
-  <img src="https://github.com/Dreamacro/clash/raw/master/docs/logo.png" alt="Clash" width="200">
+  <img src="https://github.com/Dreamacro/Crash/raw/master/docs/logo.png" alt="Crash" width="200">
-  <br>ShellClash<br>
+  <br>ShellCrash<br>
 </h1>
 
 
   <p align="center">
-	<a target="_blank" href="https://github.com/Dreamacro/clash/releases">
+	<a target="_blank" href="https://github.com/Dreamacro/Crash/releases">
-    <img src="https://img.shields.io/github/release/Dreamacro/Clash.svg?style=flat-square&label=Clash">
+    <img src="https://img.shields.io/github/release/Dreamacro/Crash.svg?style=flat-square&label=Crash">
   </a>
-  <a target="_blank" href="https://github.com/juewuy/ShellClash/releases">
+  <a target="_blank" href="https://github.com/juewuy/ShellCrash/releases">
-    <img src="https://img.shields.io/github/release/juewuy/ShellClash.svg?style=flat-square&label=ShellClash&colorB=green">
+    <img src="https://img.shields.io/github/release/juewuy/ShellCrash.svg?style=flat-square&label=ShellCrash&colorB=green">
   </a>
 </p>
 
@@ -18,9 +18,9 @@
 功能简介：
 --
 
-~通过管理脚本在Shell环境下便捷使用[Clash](https://github.com/Dreamacro/clash)<br>
+~通过管理脚本在Shell环境下便捷使用[Crash](https://github.com/Dreamacro/Crash)<br>
-~支持在Shell环境下管理[Clash各种功能](https://lancellc.gitbook.io/clash)<br>
+~支持在Shell环境下管理[Crash各种功能](https://lancellc.gitbook.io/Crash)<br>
-~支持在线导入[Clash](https://github.com/Dreamacro/clash)支持的分享、订阅及配置链接<br>~支持配置定时任务，支持配置文件定时更新<br>~支持在线安装及使用本地网页面板管理内置规则<br>
+~支持在线导入[Crash](https://github.com/Dreamacro/Crash)支持的分享、订阅及配置链接<br>~支持配置定时任务，支持配置文件定时更新<br>~支持在线安装及使用本地网页面板管理内置规则<br>
 ~支持路由模式、本机模式等多种模式切换<br>~支持在线更新<br>
 
 设备支持：
@@ -34,7 +34,7 @@
 
 ## 常见问题：
 
-[ShellClash常见问题 | Juewuy's Blog](https://juewuy.github.io/chang-jian-wen-ti/)
+[ShellCrash常见问题 | Juewuy's Blog](https://juewuy.github.io/chang-jian-wen-ti/)
 
 ## 使用方式：
 
@@ -52,7 +52,7 @@
 ```shell
 sudo -i #切换到root用户，如果需要密码，请输入密码
 bash #如已处于bash环境可跳过
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && bash /tmp/install.sh && source /etc/profile &> /dev/null
+export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && bash /tmp/install.sh && source /etc/profile &> /dev/null
 ```
 或者
 ```shell
@@ -65,12 +65,12 @@ export url='https://gh.jwsc.eu.org/master' && bash -c "$(curl -kfsSl $url/instal
 
 ```shell
 #GitHub源(可能需要代理)
-export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+export url='https://raw.githubusercontent.com/juewuy/ShellCrash/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```
 或者
 ```shell
 #jsDelivrCDN源
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```
 或者
 ```shell
@@ -82,12 +82,12 @@ export url='https://gh.jwsc.eu.org/master' && sh -c "$(curl -kfsSl $url/install.
 
 ```Shell
 #GitHub源(可能需要代理)
-export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
+export url='https://raw.githubusercontent.com/juewuy/ShellCrash/master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```
 或者
 ```shell
 #jsDelivrCDN源
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
+export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```
 
 ~**老旧设备使用低版本wge安装**：<br>
@@ -99,23 +99,23 @@ export url='http://t.jwsc.eu.org' && wget -q -O /tmp/install.sh $url/install.sh
 
 ~**DOCKER环境下安装：**<br>
 
-请参考 [ShellClash_docker 一键脚本和镜像](https://github.com/echvoyager/shellclash_docker)
+请参考 [ShellCrash_docker 一键脚本和镜像](https://github.com/echvoyager/shellCrash_docker)
 
 ### **本地安装：**<br>
 
-如使用在线安装出现问题，请参考：[本地安装ShellClash的教程 | Juewuy's Blog](https://juewuy.github.io/bdaz) 使用本地安装！<br>
+如使用在线安装出现问题，请参考：[本地安装ShellCrash的教程 | Juewuy's Blog](https://juewuy.github.io/bdaz) 使用本地安装！<br>
 
 ### 使用脚本：<br>
 
 安装完成管理脚本后，执行如下命令使用~
 
 ```Shell
-clash 		#进入对话脚本
+Crash 		#进入对话脚本
-clash -h 	#脚本帮助及说明
+Crash -h 	#脚本帮助及说明
-clash -u 	#卸载脚本
+Crash -u 	#卸载脚本
-clash -t 	#测试模式运行
+Crash -t 	#测试模式运行
-clash -s start 	#启动服务
+Crash -s start 	#启动服务
-clash -s stop 	#停止服务
+Crash -s stop 	#停止服务
 ```
 
 
@@ -137,17 +137,11 @@ ubus/iproute-doc	极低		缺少时无法正常获取本机host地址
 更新日志：
 --
 
-### [点击查看](https://github.com/juewuy/ShellClash/releases)
+### [点击查看](https://github.com/juewuy/ShellCrash/releases)
 
 交流反馈：
 --
-### [TG讨论组](https://t.me/ShellClash) 
+### [TG讨论组](https://t.me/ShellCrash) 
-
-## 请喝杯茶：
-
-​		支付宝										微信
-
-##### <img src="http://juewuy.github.io/post-images/1604390977172.png" style="zoom:50%;" /><img src="http://juewuy.github.io/post-images/1604391042406.png" style="zoom:50%;" />
 
 机场推荐：
 --

bin/geodata/china_ipv6_list.txt

@@ -201,7 +201,6 @@
 2402:f000::/32
 2402:f8c0::/47
 2403:600:a604::/46
-2403:600:a608::/48
 2403:600:b001::/48
 2403:c80::/32
 2403:1b80::/48
@@ -365,15 +364,15 @@
 2406:840:380::/48
 2406:840:3c0::/48
 2406:840:410::/48
+2406:840:420::/48
 2406:840:800::/42
-2406:840:840::/47
+2406:840:840::/48
 2406:840:860::/48
 2406:840:880::/48
 2406:840:950::/48
 2406:840:a00::/47
 2406:840:a10::/48
 2406:840:c00::/47
-2406:840:c11::/48
 2406:840:1800::/48
 2406:840:1860::/48
 2406:840:2800::/48
@@ -394,7 +393,6 @@
 2406:840:9102::/48
 2406:840:9200::/40
 2406:840:9300::/48
-2406:840:9680::/44
 2406:840:9700::/40
 2406:840:9801::/48
 2406:840:9810::/48
@@ -405,33 +403,33 @@
 2406:840:9980::/48
 2406:840:9998::/47
 2406:840:9ef0::/44
+2406:840:a000::/35
 2406:840:c0a8::/48
 2406:840:e010::/47
 2406:840:e014::/46
 2406:840:e018::/45
 2406:840:e030::/47
-2406:840:e033::/48
 2406:840:e03f::/48
 2406:840:e080::/44
 2406:840:e0cf::/48
 2406:840:e0e0::/44
 2406:840:e10f::/48
-2406:840:e140::/47
 2406:840:e14f::/48
 2406:840:e180::/44
 2406:840:e20f::/48
 2406:840:e280::/47
 2406:840:e300::/47
 2406:840:e302::/48
-2406:840:e340::/44
 2406:840:e360::/48
 2406:840:e36f::/48
 2406:840:e500::/47
 2406:840:e508::/48
+2406:840:e570::/47
 2406:840:e573::/48
-2406:840:e574::/48
+2406:840:e575::/48
 2406:840:e576::/48
 2406:840:e57b::/48
+2406:840:e57c::/48
 2406:840:e57f::/48
 2406:840:e666::/47
 2406:840:e720::/48
@@ -473,10 +471,10 @@
 2406:840:fe50::/48
 2406:840:fe60::/48
 2406:840:fe72::/47
+2406:840:fec0::/48
 2406:840:fed1::/48
 2406:840:fed2::/47
-2406:840:fed4::/47
+2406:840:fed4::/46
-2406:840:fed6::/48
 2406:840:fed8::/47
 2406:840:feda::/48
 2406:840:fedd::/48
@@ -1068,6 +1066,11 @@
 240a:aa00::/23
 240a:ac00::/22
 240a:c000::/20
+240b:e001::/32
+240b:e002::/31
+240b:e004::/30
+240b:e008::/29
+240b:e010::/32
 240c::/28
 240c:4000::/22
 240c:c000::/20
@@ -1081,6 +1084,7 @@
 240d:c010:16::/48
 240d:c010:20::/44
 240d:c010:30::/47
+240d:c010:57::/48
 240d:c010:58::/48
 240d:c010:5b::/48
 240d:c010:5c::/48
@@ -1141,6 +1145,7 @@
 2605:9d80:9071::/48
 2605:9d80:9092::/48
 2605:f440:cafe::/48
+2607:7640::/48
 2804:1e48::/32
 2a03:5840:f3::/48
 2a03:5840:310::/48
@@ -1177,12 +1182,16 @@
 2a05:1086:f000::/47
 2a05:1087::/32
 2a05:dfc1:1603::/48
-2a05:dfc1:1604::/47
+2a05:dfc1:1604::/46
-2a05:dfc1:1606::/48
+2a05:dfc1:1608::/48
-2a05:dfc1:16a0::/47
+2a05:dfc1:16b0::/45
 2a05:dfc1:16ff::/48
+2a05:dfc1:5901::/48
+2a05:dfc1:5902::/47
+2a05:dfc1:5904::/47
 2a05:dfc1:5a00::/40
 2a05:dfc1:7100::/46
+2a05:dfc1:7104::/48
 2a05:dfc1:8c01::/48
 2a05:dfc1:8c90::/47
 2a05:dfc1:8c96::/47
@@ -1231,61 +1240,45 @@
 2a06:a005:29d1::/48
 2a06:a005:2a00::/42
 2a06:a005:2af0::/44
-2a06:de00:de04::/48
+2a06:de00:de04::/47
 2a06:de00:de0e::/48
 2a06:de01:800::/48
-2a06:de01:804::/48
 2a06:de01:80d::/48
 2a06:de01:814::/48
-2a06:de01:824::/48
 2a06:de01:826::/48
-2a06:de01:840::/48
+2a06:de01:84b::/48
-2a06:de01:85d::/48
+2a06:de01:85a::/48
-2a06:de01:868::/48
+2a06:de01:879::/48
-2a06:de01:871::/48
+2a06:de01:88e::/48
-2a06:de01:873::/48
+2a06:de01:891::/48
-2a06:de01:881::/48
+2a06:de01:897::/48
-2a06:de01:886::/48
+2a06:de01:89b::/48
-2a06:de01:895::/48
+2a06:de01:8c6::/48
-2a06:de01:8b6::/48
+2a06:de01:8d4::/48
-2a06:de01:8d2::/48
+2a06:de01:8ed::/48
-2a06:de01:8e0::/48
+2a06:de01:918::/48
-2a06:de01:8ff::/48
+2a06:de01:920::/48
-2a06:de01:900::/48
+2a06:de01:925::/48
-2a06:de01:903::/48
+2a06:de01:929::/48
-2a06:de01:90a::/48
+2a06:de01:95f::/48
-2a06:de01:91a::/48
+2a06:de01:967::/48
-2a06:de01:923::/48
+2a06:de01:96d::/48
-2a06:de01:93c::/48
+2a06:de01:96f::/48
-2a06:de01:942::/48
+2a06:de01:98d::/48
-2a06:de01:948::/48
+2a06:de01:99f::/48
-2a06:de01:959::/48
+2a06:de01:9bb::/48
-2a06:de01:961::/48
+2a06:de01:a10::/48
-2a06:de01:97f::/48
-2a06:de01:981::/48
-2a06:de01:99a::/48
-2a06:de01:9a3::/48
-2a06:de01:9a7::/48
-2a06:de01:9af::/48
-2a06:de01:9bf::/48
-2a06:de01:a19::/48
-2a06:de01:a1b::/48
 2a06:de01:a21::/48
-2a06:de01:a29::/48
 2a06:de01:a31::/48
-2a06:de01:a48::/48
+2a06:de01:a49::/48
-2a06:de01:a60::/48
+2a06:de01:a53::/48
-2a06:de01:a66::/48
+2a06:de01:a55::/48
-2a06:de01:a69::/48
+2a06:de01:ac9::/48
-2a06:de01:a7e::/48
+2a06:de01:ad9::/48
-2a06:de01:acb::/48
+2a06:de01:ae9::/48
-2a06:de01:ad1::/48
+2a06:de01:b01::/48
-2a06:de01:ad7::/48
+2a06:de01:b12::/48
-2a06:de01:adc::/48
+2a06:de01:b25::/48
-2a06:de01:ae6::/48
-2a06:de01:afa::/48
-2a06:de01:b16::/48
-2a06:de01:b39::/48
 2a06:e881:2509::/48
 2a06:e881:5501::/48
 2a06:e881:5502::/48
@@ -1347,7 +1340,6 @@
 2a0a:6040:e54b::/48
 2a0a:6040:e54c::/48
 2a0a:6040:e900::/40
-2a0a:6040:ea00::/48
 2a0a:6040:ec00::/40
 2a0b:b86:ffe0::/48
 2a0b:b87:ffb5::/48
@@ -1406,8 +1398,6 @@
 2a0e:8f02:2182::/47
 2a0e:8f02:f006::/48
 2a0e:8f02:f055::/48
-2a0e:8f02:f058::/48
-2a0e:97c0:220::/44
 2a0e:97c0:550::/44
 2a0e:97c0:5ef::/48
 2a0e:97c0:804::/46
@@ -1426,6 +1416,7 @@
 2a0e:aa07:e039::/48
 2a0e:aa07:e03a::/48
 2a0e:aa07:e043::/48
+2a0e:aa07:e044::/48
 2a0e:aa07:e050::/44
 2a0e:aa07:e060::/48
 2a0e:aa07:e070::/47
@@ -1434,6 +1425,7 @@
 2a0e:aa07:e0f1::/48
 2a0e:aa07:e0f7::/48
 2a0e:aa07:e120::/44
+2a0e:aa07:e130::/48
 2a0e:aa07:e141::/48
 2a0e:aa07:e142::/47
 2a0e:aa07:e150::/44
@@ -1488,6 +1480,7 @@
 2a0f:7980::/44
 2a0f:85c1:30::/47
 2a0f:85c1:100::/47
+2a0f:9400:6110::/48
 2a0f:9400:7700::/48
 2a0f:e401:131::/48
 2a0f:e401:133::/48
@@ -1505,8 +1498,8 @@
 2a10:ccc0:cc1::/48
 2a10:ccc0:cc2::/48
 2a10:ccc0:ccc::/48
-2a10:ccc0:ccc5::/48
 2a10:ccc0:ccc6::/48
+2a10:ccc0:ccc8::/48
 2a10:ccc0:cccc::/46
 2a11:f2c0:ffc4::/48
 2a12:3fc2:6600::/48
@@ -1520,7 +1513,6 @@
 2a12:3fc7::/48
 2a12:3fc7:8000::/48
 2a12:dd47:5c00::/40
-2a12:f8c0::/48
 2a12:f8c0:1000::/40
 2a12:f8c0:1200::/40
 2a12:f8c1::/48
@@ -1536,21 +1528,18 @@
 2a13:a5c3:1000::/36
 2a13:a5c3:2000::/35
 2a13:a5c3:4000::/36
-2a13:a5c3:f000::/40
 2a13:a5c7:1200::/40
-2a13:a5c7:1510::/44
+2a13:a5c7:1500::/40
-2a13:a5c7:1560::/44
-2a13:a5c7:1580::/44
 2a13:b487:1200::/44
 2a13:b487:1bb0::/48
 2a13:b487:1bb2::/48
 2a13:b487:1bb4::/47
-2a13:b487:1bb7::/48
 2a13:b487:1bbb::/48
 2a13:b487:1f00::/47
 2a13:b487:4201::/48
 2a13:b487:4202::/48
 2a13:b487:4205::/48
+2a13:b487:4206::/48
 2a13:b487:42c0::/43
 2a13:df80:3809::/48
 2a13:df80:6808::/48

bin/version

@@ -3,4 +3,4 @@ clashpre_v=2022.11.25
 clash_v=v1.7.1
 meta_v=v1.16.0
 versionsh=1.8.1
-GeoIP_v=20231021
+GeoIP_v=20231028