From 314ac8312de5ce6ab97869e31fed51b7ff18c921 Mon Sep 17 00:00:00 2001 From: misakano7545 Date: Wed, 27 Apr 2022 12:39:24 +0800 Subject: [PATCH 1/6] Change download url --- XrayR.sh | 8 ++++---- install.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/XrayR.sh b/XrayR.sh index 0fd3d5a..0c74e97 100644 --- a/XrayR.sh +++ b/XrayR.sh @@ -84,7 +84,7 @@ before_show_menu() { } install() { - bash <(curl -Ls https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/install.sh) + bash <(curl -Ls https://raw.githubusercontent.com/Misaka-blog/XrayR-script/master/install.sh) if [[ $? == 0 ]]; then if [[ $# == 0 ]]; then start @@ -108,7 +108,7 @@ update() { # fi # return 0 # fi - bash <(curl -Ls https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/install.sh) $version + bash <(curl -Ls https://raw.githubusercontent.com/Misaka-blog/XrayR-script/master/install.sh) $version if [[ $? == 0 ]]; then echo -e "${green}更新完成，已自动重启 XrayR，请使用 XrayR log 查看运行日志${plain}" exit @@ -270,7 +270,7 @@ install_bbr() { } update_shell() { - wget -O /usr/bin/XrayR -N --no-check-certificate https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/XrayR.sh + wget -O /usr/bin/XrayR -N --no-check-certificate https://raw.githubusercontent.com/Misaka-blog/XrayR-script/master/XrayR.sh if [[ $? != 0 ]]; then echo "" echo -e "${red}下载脚本失败，请检查本机能否连接 Github${plain}" @@ -387,7 +387,7 @@ show_usage() { show_menu() { echo -e " ${green}XrayR 后端管理脚本，${plain}${red}不适用于docker${plain} ---- https://github.com/XrayR-project/XrayR --- +--- https://github.com/Misaka-blog/XrayR --- ${green}0.${plain} 修改配置 ———————————————— ${green}1.${plain} 安装 XrayR diff --git a/install.sh b/install.sh index c1f0ee5..28fa935 100644 --- a/install.sh +++ b/install.sh @@ -107,20 +107,20 @@ install_XrayR() { cd /usr/local/XrayR/ if [ $# == 0 ] ;then - last_version=$(curl -Ls "https://api.github.com/repos/XrayR-project/XrayR/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + last_version=$(curl -Ls "https://api.github.com/repos/Misaka-blog/XrayR/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') if [[ ! -n "$last_version" ]]; then echo -e "${red}检测 XrayR 版本失败，可能是超出 Github API 限制，请稍后再试，或手动指定 XrayR 版本安装${plain}" exit 1 fi echo -e "检测到 XrayR 最新版本：${last_version}，开始安装" - wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip https://github.com/XrayR-project/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip + wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip https://github.com/Misaka-blog/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip if [[ $? -ne 0 ]]; then echo -e "${red}下载 XrayR 失败，请确保你的服务器能够下载 Github 的文件${plain}" exit 1 fi else last_version=$1 - url="https://github.com/XrayR-project/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" + url="https://github.com/Misaka-blog/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" echo -e "开始安装 XrayR v$1" wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip ${url} if [[ $? -ne 0 ]]; then @@ -134,7 +134,7 @@ install_XrayR() { chmod +x XrayR mkdir /etc/XrayR/ -p rm /etc/systemd/system/XrayR.service -f - file="https://github.com/XrayR-project/XrayR-release/raw/master/XrayR.service" + file="https://github.com/Misaka-blog/XrayR-script/raw/master/XrayR.service" wget -q -N --no-check-certificate -O /etc/systemd/system/XrayR.service ${file} #cp -f XrayR.service /etc/systemd/system/ systemctl daemon-reload @@ -175,7 +175,7 @@ install_XrayR() { if [[ ! -f /etc/XrayR/ruelist ]]; then cp ruelist /etc/XrayR/ fi - curl -o /usr/bin/XrayR -Ls https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/XrayR.sh + curl -o /usr/bin/XrayR -Ls https://raw.githubusercontent.com/Misaka-blog/XrayR-script/master/XrayR.sh chmod +x /usr/bin/XrayR ln -s /usr/bin/XrayR /usr/bin/xrayr # 小写兼容 chmod +x /usr/bin/xrayr From 57ea007e65b664928230ebaeffc08b7faa45e9d1 Mon Sep 17 00:00:00 2001 From: misakano7545 Date: Wed, 27 Apr 2022 13:32:48 +0800 Subject: [PATCH 2/6] Add s390x support --- install.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 28fa935..51ad147 100644 --- a/install.sh +++ b/install.sh @@ -32,12 +32,14 @@ fi arch=$(arch) if [[ $arch == "x86_64" || $arch == "x64" || $arch == "amd64" ]]; then - arch="64" + arch="64" elif [[ $arch == "aarch64" || $arch == "arm64" ]]; then - arch="arm64-v8a" + arch="arm64-v8a" +elif [[ $arch == "s390x" ]]; then + arch="s390x" else - arch="64" - echo -e "${red}检测架构失败，使用默认架构: ${arch}${plain}" + arch="64" + echo -e "${red}检测架构失败，使用默认架构: ${arch}${plain}" fi echo "架构: ${arch}" From 80af0d9719dbfdbc1935d807b47dd01b8fdc0c13 Mon Sep 17 00:00:00 2001 From: misakano7545 Date: Wed, 27 Apr 2022 13:35:45 +0800 Subject: [PATCH 3/6] Edit README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dbe578f..f1f37d4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Find the source code here: [XrayR-project/XrayR](https://github.com/XrayR-projec # 一键安装 ``` -bash <(curl -Ls https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/Misaka-blog/XrayR-script/master/install.sh) ``` # Docker 安装 From 43a6cd2605735cf2e9bcd2e5671871fc5644740f Mon Sep 17 00:00:00 2001 From: misakano7545 Date: Wed, 27 Apr 2022 13:36:48 +0800 Subject: [PATCH 4/6] Add s390x support --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f1f37d4..25d5e4b 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ curl -fsSL https://get.docker.com | bash -s docker curl -L "https://github.com/docker/compose/releases/download/1.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose ``` -1. `git clone https://github.com/XrayR-project/XrayR-release` +1. `git clone https://github.com/Misaka-blog/XrayR-script` 2. `cd XrayR-release` 3. 编辑config。 配置文件基本格式如下，Nodes下可以同时添加多个面板，多个节点配置信息，只需添加相同格式的Nodes item即可。 From db258deb8941c216ea36bb22b9fe9959f5ebb017 Mon Sep 17 00:00:00 2001 From: misakano7545 Date: Wed, 27 Apr 2022 13:37:33 +0800 Subject: [PATCH 5/6] Edit README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25d5e4b..5bd94b8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ curl -L "https://github.com/docker/compose/releases/download/1.26.1/docker-compo chmod +x /usr/local/bin/docker-compose ``` 1. `git clone https://github.com/Misaka-blog/XrayR-script` -2. `cd XrayR-release` +2. `cd XrayR-script` 3. 编辑config。 配置文件基本格式如下，Nodes下可以同时添加多个面板，多个节点配置信息，只需添加相同格式的Nodes item即可。 4. 启动docker：`docker-compose up -d` From 4f760cb7ccc3d520affc0622f19c49914e4f9c42 Mon Sep 17 00:00:00 2001 From: pig995 <70630613+pig995@users.noreply.github.com> Date: Sat, 9 Jul 2022 20:43:49 +0800 Subject: [PATCH 6/6] Update install.sh --- install.sh | 62 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/install.sh b/install.sh index 51ad147..9d443ee 100644 --- a/install.sh +++ b/install.sh @@ -17,18 +17,20 @@ elif cat /etc/issue | grep -Eqi "debian"; then release="debian" elif cat /etc/issue | grep -Eqi "ubuntu"; then release="ubuntu" -elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then +elif cat /etc/issue | grep -Eqi "centos|red hat|redhat|rocky|alma|oracle linux"; then release="centos" elif cat /proc/version | grep -Eqi "debian"; then release="debian" elif cat /proc/version | grep -Eqi "ubuntu"; then release="ubuntu" -elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then +elif cat /proc/version | grep -Eqi "centos|red hat|redhat|rocky|alma|oracle linux"; then release="centos" else echo -e "${red}未检测到系统版本，请联系脚本作者！${plain}\n" && exit 1 fi +os_version="" + arch=$(arch) if [[ $arch == "x86_64" || $arch == "x64" || $arch == "amd64" ]]; then @@ -49,8 +51,6 @@ if [ "$(getconf WORD_BIT)" != '32' ] && [ "$(getconf LONG_BIT)" != '64' ] ; then exit 2 fi -os_version="" - # os version if [[ -f /etc/os-release ]]; then os_version=$(awk -F'[= ."]' '/VERSION_ID/{print $3}' /etc/os-release) @@ -78,7 +78,7 @@ install_base() { yum install epel-release -y yum install wget curl unzip tar crontabs socat -y else - apt update -y + apt-get update -y apt install wget curl unzip tar cron socat -y fi } @@ -102,27 +102,27 @@ install_acme() { install_XrayR() { if [[ -e /usr/local/XrayR/ ]]; then - rm /usr/local/XrayR/ -rf + rm -rf /usr/local/XrayR/ fi mkdir /usr/local/XrayR/ -p - cd /usr/local/XrayR/ + cd /usr/local/XrayR/ if [ $# == 0 ] ;then - last_version=$(curl -Ls "https://api.github.com/repos/Misaka-blog/XrayR/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + last_version=$(curl -Ls "https://api.github.com/repos/pig995/panels/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') if [[ ! -n "$last_version" ]]; then echo -e "${red}检测 XrayR 版本失败，可能是超出 Github API 限制，请稍后再试，或手动指定 XrayR 版本安装${plain}" exit 1 fi echo -e "检测到 XrayR 最新版本：${last_version}，开始安装" - wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip https://github.com/Misaka-blog/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip + wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip https://github.com/pig995/panels/releases/download/${last_version}/XrayR-linux-${arch}.zip if [[ $? -ne 0 ]]; then echo -e "${red}下载 XrayR 失败，请确保你的服务器能够下载 Github 的文件${plain}" exit 1 fi else last_version=$1 - url="https://github.com/Misaka-blog/XrayR/releases/download/${last_version}/XrayR-linux-${arch}.zip" + url="https://github.com/pig995/panels/releases/download/${last_version}/XrayR-linux-${arch}.zip" echo -e "开始安装 XrayR v$1" wget -q -N --no-check-certificate -O /usr/local/XrayR/XrayR-linux.zip ${url} if [[ $? -ne 0 ]]; then @@ -136,7 +136,7 @@ install_XrayR() { chmod +x XrayR mkdir /etc/XrayR/ -p rm /etc/systemd/system/XrayR.service -f - file="https://github.com/Misaka-blog/XrayR-script/raw/master/XrayR.service" + file="https://github.com/pig995/panels/raw/master/XrayR.service" wget -q -N --no-check-certificate -O /etc/systemd/system/XrayR.service ${file} #cp -f XrayR.service /etc/systemd/system/ systemctl daemon-reload @@ -149,7 +149,7 @@ install_XrayR() { if [[ ! -f /etc/XrayR/config.yml ]]; then cp config.yml /etc/XrayR/ echo -e "" - echo -e "全新安装，请先参看教程：https://github.com/XrayR-project/XrayR，配置必要的内容" + echo -e "全新安装，请先参看教程：https://github.com/pig995/XrayR，配置必要的内容" else systemctl start XrayR sleep 2 @@ -158,7 +158,7 @@ install_XrayR() { if [[ $? == 0 ]]; then echo -e "${green}XrayR 重启成功${plain}" else - echo -e "${red}XrayR 可能启动失败，请稍后使用 XrayR log 查看日志信息，若无法启动，则可能更改了配置格式，请前往 wiki 查看：https://github.com/XrayR-project/XrayR/wiki${plain}" + echo -e "${red}XrayR 可能启动失败，请稍后使用 XrayR log 查看日志信息，若无法启动，则可能更改了配置格式，请前往 wiki 查看：https://github.com/pig995/XrayR/wiki${plain}" fi fi @@ -174,30 +174,32 @@ install_XrayR() { if [[ ! -f /etc/XrayR/custom_inbound.json ]]; then cp custom_inbound.json /etc/XrayR/ fi - if [[ ! -f /etc/XrayR/ruelist ]]; then - cp ruelist /etc/XrayR/ + if [[ ! -f /etc/XrayR/rulelist ]]; then + cp rulelist /etc/XrayR/ fi - curl -o /usr/bin/XrayR -Ls https://raw.githubusercontent.com/Misaka-blog/XrayR-script/master/XrayR.sh + curl -o /usr/bin/XrayR -Ls https://raw.githubusercontent.com/pig995/panels/master/XrayR.sh chmod +x /usr/bin/XrayR ln -s /usr/bin/XrayR /usr/bin/xrayr # 小写兼容 chmod +x /usr/bin/xrayr + cd $cur_dir + rm -f install.sh echo -e "" echo "XrayR 管理脚本使用方法 (兼容使用xrayr执行，大小写不敏感): " echo "------------------------------------------" - echo "XrayR - 显示管理菜单 (功能更多)" - echo "XrayR start - 启动 XrayR" - echo "XrayR stop - 停止 XrayR" - echo "XrayR restart - 重启 XrayR" - echo "XrayR status - 查看 XrayR 状态" - echo "XrayR enable - 设置 XrayR 开机自启" - echo "XrayR disable - 取消 XrayR 开机自启" - echo "XrayR log - 查看 XrayR 日志" - echo "XrayR update - 更新 XrayR" - echo "XrayR update x.x.x - 更新 XrayR 指定版本" - echo "XrayR config - 显示配置文件内容" - echo "XrayR install - 安装 XrayR" - echo "XrayR uninstall - 卸载 XrayR" - echo "XrayR version - 查看 XrayR 版本" + echo "XrayR - 显示管理菜单 (功能更多)" + echo "XrayR start - 启动 XrayR" + echo "XrayR stop - 停止 XrayR" + echo "XrayR restart - 重启 XrayR" + echo "XrayR status - 查看 XrayR 状态" + echo "XrayR enable - 设置 XrayR 开机自启" + echo "XrayR disable - 取消 XrayR 开机自启" + echo "XrayR log - 查看 XrayR 日志" + echo "XrayR generate - 生成 XrayR 配置文件" + echo "XrayR update - 更新 XrayR" + echo "XrayR update x.x.x - 更新 XrayR 指定版本" + echo "XrayR install - 安装 XrayR" + echo "XrayR uninstall - 卸载 XrayR" + echo "XrayR version - 查看 XrayR 版本" echo "------------------------------------------" }