Update Version

Author: Jrohy

setup.py

@@ -13,7 +13,7 @@
     description="a tool to manage v2ray config json",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    keywords='python v2ray multi-v2ray vmess socks5 vless trojan',
+    keywords='python v2ray multi-v2ray vmess socks5 vless trojan xray',
     author='Jrohy',
     author_email='[email protected]',
     url='https://github.com/Jrohy/multi-v2ray',

v2ray.sh

@@ -86,19 +86,25 @@ removeV2Ray() {
     rm -rf /etc/v2ray >/dev/null 2>&1
     rm -rf /var/log/v2ray >/dev/null 2>&1
 
+    #卸载Xray脚本
+    bash <(curl -L -s https://multi.netlify.app/go.sh) --remove -x >/dev/null 2>&1
+    rm -rf /etc/xray >/dev/null 2>&1
+    rm -rf /var/log/xray >/dev/null 2>&1
+
     #清理v2ray相关iptable规则
     bash <(curl -L -s $CLEAN_IPTABLES_SHELL)
 
     #卸载multi-v2ray
     pip uninstall v2ray_util -y
     rm -rf /usr/share/bash-completion/completions/v2ray.bash >/dev/null 2>&1
     rm -rf /usr/share/bash-completion/completions/v2ray >/dev/null 2>&1
+    rm -rf /usr/share/bash-completion/completions/xray >/dev/null 2>&1
     rm -rf /etc/bash_completion.d/v2ray.bash >/dev/null 2>&1
     rm -rf /usr/local/bin/v2ray >/dev/null 2>&1
     rm -rf /etc/v2ray_util >/dev/null 2>&1
 
     #删除v2ray定时更新任务
-    crontab -l|sed '/SHELL=/d;/v2ray/d' > crontab.txt
+    crontab -l|sed '/SHELL=/d;/v2ray/d'|sed '/SHELL=/d;/xray/d' > crontab.txt
     crontab crontab.txt >/dev/null 2>&1
     rm -f crontab.txt >/dev/null 2>&1
 
@@ -110,6 +116,7 @@ removeV2Ray() {
 
     #删除multi-v2ray环境变量
     sed -i '/v2ray/d' ~/$ENV_FILE
+    sed -i '/xray/d' ~/$ENV_FILE
     source ~/$ENV_FILE
 
     colorEcho ${GREEN} "uninstall success!"
@@ -175,7 +182,12 @@ updateProject() {
 
     #更新v2ray bash_completion脚本
     curl $BASH_COMPLETION_SHELL > /usr/share/bash-completion/completions/v2ray
-    [[ -z $(echo $SHELL|grep zsh) ]] && source /usr/share/bash-completion/completions/v2ray
+    curl $BASH_COMPLETION_SHELL > /usr/share/bash-completion/completions/xray
+    sed -i 's/v2ray/xray/g' /usr/share/bash-completion/completions/xray
+    if [[ -z $(echo $SHELL|grep zsh) ]];then
+        source /usr/share/bash-completion/completions/v2ray
+        source /usr/share/bash-completion/completions/xray
+    fi
 
     #安装V2ray主程序
     [[ ${INSTALL_WAY} == 0 ]] && bash <(curl -L -s https://multi.netlify.app/go.sh)

v2ray_util/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.8.12.2'
+__version__ = '3.9.0'
 
 import sys
 if "xray" in sys.argv[0]:

v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo

@@ -57,8 +57,8 @@ msgstr "4.查看配置"
 msgid "5.Global Setting"
 msgstr "5.全局功能"
 
-msgid "6.Update V2Ray"
-msgstr "6.更新V2Ray"
+msgid "6.Update V2ray"
+msgstr "6.更新V2ray"
 
 msgid "6.Update Xray"
 msgstr "6.更新Xray"