mirror of https://github.com/wulabing/Xray_onekey
fix: raw.githubusercontents.com => raw.githubusercontent.com (#415)
parent
b768c8f5f6
commit
749d8268d9
22
install.sh
22
install.sh
|
@ -91,12 +91,12 @@ function system_check() {
|
||||||
fi
|
fi
|
||||||
print_ok "当前系统为 Centos ${VERSION_ID} ${VERSION}"
|
print_ok "当前系统为 Centos ${VERSION_ID} ${VERSION}"
|
||||||
INS="yum install -y"
|
INS="yum install -y"
|
||||||
wget -N -P /etc/yum.repos.d/ https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/basic/nginx.repo
|
wget -N -P /etc/yum.repos.d/ https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/basic/nginx.repo
|
||||||
elif [[ "${ID}" == "ol" ]]; then
|
elif [[ "${ID}" == "ol" ]]; then
|
||||||
print_ok "当前系统为 Oracle Linux ${VERSION_ID} ${VERSION}"
|
print_ok "当前系统为 Oracle Linux ${VERSION_ID} ${VERSION}"
|
||||||
INS="yum install -y"
|
INS="yum install -y"
|
||||||
compatible_nginx_conf="yes"
|
compatible_nginx_conf="yes"
|
||||||
wget -N -P /etc/yum.repos.d/ https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/basic/nginx.repo
|
wget -N -P /etc/yum.repos.d/ https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/basic/nginx.repo
|
||||||
elif [[ "${ID}" == "debian" && ${VERSION_ID} -ge 9 ]]; then
|
elif [[ "${ID}" == "debian" && ${VERSION_ID} -ge 9 ]]; then
|
||||||
if [[ ${VERSION_ID} -ge 10 ]]; then
|
if [[ ${VERSION_ID} -ge 10 ]]; then
|
||||||
compatible_nginx_conf="no"
|
compatible_nginx_conf="no"
|
||||||
|
@ -224,7 +224,7 @@ function dependency_install() {
|
||||||
${INS} jq
|
${INS} jq
|
||||||
|
|
||||||
if ! command -v jq; then
|
if ! command -v jq; then
|
||||||
wget -P /usr/bin https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/binary/jq && chmod +x /usr/bin/jq
|
wget -P /usr/bin https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/binary/jq && chmod +x /usr/bin/jq
|
||||||
judge "安装 jq"
|
judge "安装 jq"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -305,13 +305,13 @@ function port_exist_check() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
function update_sh() {
|
function update_sh() {
|
||||||
ol_version=$(curl -L -s https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/install.sh | grep "shell_version=" | head -1 | awk -F '=|"' '{print $3}')
|
ol_version=$(curl -L -s https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/install.sh | grep "shell_version=" | head -1 | awk -F '=|"' '{print $3}')
|
||||||
if [[ "$shell_version" != "$(echo -e "$shell_version\n$ol_version" | sort -rV | head -1)" ]]; then
|
if [[ "$shell_version" != "$(echo -e "$shell_version\n$ol_version" | sort -rV | head -1)" ]]; then
|
||||||
print_ok "存在新版本,是否更新 [Y/N]?"
|
print_ok "存在新版本,是否更新 [Y/N]?"
|
||||||
read -r update_confirm
|
read -r update_confirm
|
||||||
case $update_confirm in
|
case $update_confirm in
|
||||||
[yY][eE][sS] | [yY])
|
[yY][eE][sS] | [yY])
|
||||||
wget -N --no-check-certificate https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/install.sh
|
wget -N --no-check-certificate https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/install.sh
|
||||||
print_ok "更新完成"
|
print_ok "更新完成"
|
||||||
print_ok "您可以通过 bash $0 执行本程序"
|
print_ok "您可以通过 bash $0 执行本程序"
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -377,7 +377,7 @@ function modify_port() {
|
||||||
function configure_nginx_temp(){
|
function configure_nginx_temp(){
|
||||||
nginx_conf="/etc/nginx/conf.d/${domain}.conf"
|
nginx_conf="/etc/nginx/conf.d/${domain}.conf"
|
||||||
cd /etc/nginx/conf.d/ && rm -f ${domain}.conf
|
cd /etc/nginx/conf.d/ && rm -f ${domain}.conf
|
||||||
wget -O ${domain}.conf https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/config/web_temp.conf
|
wget -O ${domain}.conf https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/web_temp.conf
|
||||||
sed -i "s/xxx/${domain}/g" ${nginx_conf}
|
sed -i "s/xxx/${domain}/g" ${nginx_conf}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -385,9 +385,9 @@ function configure_nginx() {
|
||||||
nginx_conf="/etc/nginx/conf.d/${domain}.conf"
|
nginx_conf="/etc/nginx/conf.d/${domain}.conf"
|
||||||
cd /etc/nginx/conf.d/ && rm -f ${domain}.conf
|
cd /etc/nginx/conf.d/ && rm -f ${domain}.conf
|
||||||
if [[ $compatible_nginx_conf == "yes" ]]; then
|
if [[ $compatible_nginx_conf == "yes" ]]; then
|
||||||
wget -O ${domain}.conf https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/config/web_compatible.conf
|
wget -O ${domain}.conf https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/web_compatible.conf
|
||||||
elif [[ $compatible_nginx_conf == "no" ]]; then
|
elif [[ $compatible_nginx_conf == "no" ]]; then
|
||||||
wget -O ${domain}.conf https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/config/web.conf
|
wget -O ${domain}.conf https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/web.conf
|
||||||
fi
|
fi
|
||||||
sed -i "s/xxx/${domain}/g" ${nginx_conf}
|
sed -i "s/xxx/${domain}/g" ${nginx_conf}
|
||||||
modify_port
|
modify_port
|
||||||
|
@ -404,7 +404,7 @@ function modify_inbound_port() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function configure_xray_ws() {
|
function configure_xray_ws() {
|
||||||
cd /usr/local/etc/xray && rm -f config.json && wget -O config.json https://raw.githubusercontents.com/wulabing/Xray_onekey/${github_branch}/config/xray_tls_ws.json
|
cd /usr/local/etc/xray && rm -f config.json && wget -O config.json https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/xray_tls_ws.json
|
||||||
modify_UUID
|
modify_UUID
|
||||||
modify_ws
|
modify_ws
|
||||||
modify_inbound_port
|
modify_inbound_port
|
||||||
|
@ -522,7 +522,7 @@ function generate_certificate() {
|
||||||
function configure_web() {
|
function configure_web() {
|
||||||
rm -rf /www/xray_web
|
rm -rf /www/xray_web
|
||||||
mkdir -p /www/xray_web
|
mkdir -p /www/xray_web
|
||||||
# wget -O web.tar.gz https://raw.githubusercontents.com/wulabing/Xray_onekey/main/basic/web.tar.gz
|
# wget -O web.tar.gz https://raw.githubusercontent.com/wulabing/Xray_onekey/main/basic/web.tar.gz
|
||||||
# tar xzf web.tar.gz -C /www/xray_web
|
# tar xzf web.tar.gz -C /www/xray_web
|
||||||
# judge "站点伪装"
|
# judge "站点伪装"
|
||||||
# rm -f web.tar.gz
|
# rm -f web.tar.gz
|
||||||
|
@ -615,7 +615,7 @@ function show_error_log() {
|
||||||
|
|
||||||
function bbr_boost_sh() {
|
function bbr_boost_sh() {
|
||||||
[ -f "tcp.sh" ] && rm -rf ./tcp.sh
|
[ -f "tcp.sh" ] && rm -rf ./tcp.sh
|
||||||
wget -N --no-check-certificate "https://raw.githubusercontents.com/ylx2016/Linux-NetSpeed/master/tcp.sh" && chmod +x tcp.sh && ./tcp.sh
|
wget -N --no-check-certificate "https://raw.githubusercontent.com/ylx2016/Linux-NetSpeed/master/tcp.sh" && chmod +x tcp.sh && ./tcp.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
function mtproxy_sh() {
|
function mtproxy_sh() {
|
||||||
|
|
Loading…
Reference in New Issue