mirror of https://github.com/mack-a/v2ray-agent
feat(脚本): 修改xray-core-->Xray-core、删除日志打印
parent
2e3b669dc3
commit
1dc5312231
13
install.sh
13
install.sh
|
@ -103,7 +103,6 @@ readInstallType(){
|
||||||
xrayCoreConfigFilePath=
|
xrayCoreConfigFilePath=
|
||||||
v2rayCoreConfigFilePath=
|
v2rayCoreConfigFilePath=
|
||||||
|
|
||||||
echo 进入readInstallType
|
|
||||||
# 1.检测安装目录
|
# 1.检测安装目录
|
||||||
if [[ -d "/etc/v2ray-agent" ]]
|
if [[ -d "/etc/v2ray-agent" ]]
|
||||||
then
|
then
|
||||||
|
@ -267,16 +266,10 @@ cleanUp(){
|
||||||
}
|
}
|
||||||
|
|
||||||
initVar
|
initVar
|
||||||
echo initVar
|
|
||||||
checkSystem
|
checkSystem
|
||||||
echo checkSystem
|
|
||||||
readInstallType
|
readInstallType
|
||||||
echo readInstallType
|
|
||||||
readCustomInstallType
|
readCustomInstallType
|
||||||
echo readCustomInstallType
|
|
||||||
readConfigHostPathUUID
|
readConfigHostPathUUID
|
||||||
echo readConfigHostPathUUID
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# -------------------------------------------------------------
|
# -------------------------------------------------------------
|
||||||
|
@ -1159,10 +1152,10 @@ installXrayService(){
|
||||||
then
|
then
|
||||||
rm -rf /etc/systemd/system/xray.service
|
rm -rf /etc/systemd/system/xray.service
|
||||||
touch /etc/systemd/system/xray.service
|
touch /etc/systemd/system/xray.service
|
||||||
execStart='/etc/v2ray-agent/xray/xray -config /etc/v2ray-agent/xray/config_full.json'
|
execStart='/etc/v2ray-agent/xray/xray run -config /etc/v2ray-agent/xray/config_full.json'
|
||||||
if [[ ! -z ${customInstallType} ]]
|
if [[ ! -z ${customInstallType} ]]
|
||||||
then
|
then
|
||||||
execStart='/etc/v2ray-agent/xray/xray -confdir /etc/v2ray-agent/xray/conf'
|
execStart='/etc/v2ray-agent/xray/xray run -confdir /etc/v2ray-agent/xray/conf'
|
||||||
fi
|
fi
|
||||||
cat << EOF > /etc/systemd/system/xray.service
|
cat << EOF > /etc/systemd/system/xray.service
|
||||||
[Unit]
|
[Unit]
|
||||||
|
@ -3185,7 +3178,7 @@ customInstall(){
|
||||||
selectCoreInstall(){
|
selectCoreInstall(){
|
||||||
echoContent skyBlue "\n功能 1/${totalProgress} : 选择核心安装"
|
echoContent skyBlue "\n功能 1/${totalProgress} : 选择核心安装"
|
||||||
echoContent red "\n=============================================================="
|
echoContent red "\n=============================================================="
|
||||||
echoContent yellow "1.xray-core"
|
echoContent yellow "1.Xray-core"
|
||||||
echoContent yellow "2.v2ray-core"
|
echoContent yellow "2.v2ray-core"
|
||||||
echoContent yellow "3.v2ray-core[XTLS]"
|
echoContent yellow "3.v2ray-core[XTLS]"
|
||||||
echoContent red "=============================================================="
|
echoContent red "=============================================================="
|
||||||
|
|
Loading…
Reference in New Issue