Compare commits

..

No commits in common. "main" and "xray" have entirely different histories.
main ... xray

44 changed files with 15 additions and 16 deletions

View File

@ -1,4 +1,4 @@
```
wget -O builds.sh https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/builds.sh && sh builds.sh
wget -O builds.sh https://gh.0507.dpdns.org/https://github.com/a131878/cns/blob/main/builds.sh && sh builds.sh
```

View File

@ -95,8 +95,8 @@ InstallFiles() {
fi
mkdir -p "$amy4Server_install_dir" || Error "Create amy4Server install directory failed."
cd "$amy4Server_install_dir" || exit 1
download_tool amy4Server https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/amy/${os}_${machine} || Error "amy4Server download failed."
download_tool amy4Server.init https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/amy/amy4Server.init || Error "amy4Server.init download failed."
download_tool amy4Server https://github.com/a131878/cns/blob/main/amy/${os}_${machine} || Error "amy4Server download failed."
download_tool amy4Server.init https://github.com/a131878/cns/blob/main/amy/amy4Server.init || Error "amy4Server.init download failed."
[ -f '/etc/rc.common' ] && rcCommon='/etc/rc.common'
sed -i "s~#!/bin/sh~#!$SHELL $rcCommon~" amy4Server.init
sed -i "s~\[amy4Server_install_dir\]~$amy4Server_install_dir~g" amy4Server.init
@ -117,7 +117,7 @@ InstallFiles() {
EOF
chmod -R +rwx "$amy4Server_install_dir" /etc/init.d/amy4Server
if type systemctl &>/dev/null && [ -z "$(systemctl --failed|grep -q 'Host is down')" ]; then
download_tool /lib/systemd/system/amy4Server.service https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/amy/amy4Server.service || Error "amy4Server.service download failed."
download_tool /lib/systemd/system/amy4Server.service https://github.com/a131878/cns/blob/main/amy/amy4Server.service || Error "amy4Server.service download failed."
chmod +rwx /lib/systemd/system/amy4Server.service
sed -i "s~\[amy4Server_install_dir\]~$amy4Server_install_dir~g" /lib/systemd/system/amy4Server.service
systemctl daemon-reload
@ -192,7 +192,7 @@ Install() {
if ! echo "$ret"|grep -q 'OK' || echo "$ret"|grep -q 'FAILED'; then
Error "amy4Server install failed."
fi
type systemctl &>/dev/null && systemctl daemon-reload && [ -z "$(systemctl --failed|grep -q 'Host is down')" ] && systemctl restart amy4Server
type systemctl &>/dev/null && [ -z "$(systemctl --failed|grep -q 'Host is down')" ] && systemctl restart amy4Server
echo $echo_e_arg \
"\033[44;37mamy4Server install success.\033[0;34m
\r amy4Server server port:\033[35G${amy4Server_port}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -135,7 +135,7 @@ xray_set() {
}
cns_task() {
if $download_tool_cmd cns.sh https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/cns/cns.sh; then
if $download_tool_cmd cns.sh https://gh.0507.dpdns.org/https://github.com/a131878/cns/blob/main/builds.sh/CoverUp137/cns/refs/heads/main/cns/cns.sh; then
chmod 777 cns.sh
sed -i "s~#\!/bin/bash~#\!$SHELL~" cns.sh
echo $echo_opt_e "n\ny\ny\ny\ny\n"|./cns.sh $task_type && \
@ -149,7 +149,7 @@ cns_task() {
amy4Server_task() {
if $download_tool_cmd amy4Server.sh https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/amy/amy4Server.sh; then
if $download_tool_cmd amy4Server.sh https://gh.0507.dpdns.org/https://github.com/a131878/cns/blob/main/builds.sh/CoverUp137/cns/refs/heads/main/amy/amy4Server.sh; then
chmod 777 amy4Server.sh
sed -i "s~#\!/bin/bash~#\!$SHELL~" amy4Server.sh
echo $echo_opt_e "n"|./amy4Server.sh $task_type && \
@ -163,7 +163,7 @@ amy4Server_task() {
xray_task() {
if $download_tool_cmd xray.sh https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/xray/xray.sh; then
if $download_tool_cmd xray.sh https://gh.0507.dpdns.org/https://github.com/a131878/cns/blob/main/builds.sh/CoverUp137/cns/refs/heads/main/xray/xray.sh; then
chmod 777 xray.sh
sed -i "s~#\!/bin/bash~#\!$SHELL~" xray.sh
echo $echo_opt_e "n\ny\ny\ny\ny\n"|./xray.sh $task_type && \

View File

@ -71,8 +71,8 @@ InstallFiles() {
fi
mkdir -p "$cns_install_dir" || Error "Create cns install directory failed."
cd "$cns_install_dir" || exit 1
$download_tool_cmd cns https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/cns/linux_${machine} || Error "cns download failed."
$download_tool_cmd cns.init https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/cns/cns.init || Error "cns.init download failed."
$download_tool_cmd cns https://github.com/a131878/cns/blob/main/cns/linux_${machine} || Error "cns download failed."
$download_tool_cmd cns.init https://github.com/a131878/cns/edit/main/cns/cns.init || Error "cns.init download failed."
[ -f '/etc/rc.common' ] && rcCommon='/etc/rc.common'
sed -i "s~#!/bin/sh~#!$SHELL $rcCommon~" cns.init
sed -i "s~\[cns_start_cmd\]~$cns_start_cmd~g" cns.init
@ -99,7 +99,7 @@ InstallFiles() {
EOF
chmod -R +rwx "$cns_install_dir" /etc/init.d/cns
if type systemctl && [ -z "$(systemctl --failed|grep -q 'Host is down')" ]; then
$download_tool_cmd /lib/systemd/system/cns.service https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/cns/cns.service || Error "cns.service download failed."
$download_tool_cmd /lib/systemd/system/cns.service https://github.com/a131878/cns/edit/main/cns/cns.service || Error "cns.service download failed."
chmod +rwx /lib/systemd/system/cns.service
sed -i "s~\[cns_install_dir\]~$cns_install_dir~g" /lib/systemd/system/cns.service
systemctl daemon-reload

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
xray/386

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
xray/arm

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
xray/mips

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +0,0 @@
https://github.com/felix-fly/xray-openwrt/releases/tag/v1.8.24

View File

@ -234,7 +234,7 @@ Config() {
echo -n "Install UPX compress version?[n]: "
read xray_UPX
fi
#echo "$xray_UPX"|grep -qi '^y' && xray_UPX="upx" || xray_UPX=""
echo "$xray_UPX"|grep -qi '^y' && xray_UPX="upx" || xray_UPX=""
}
GetAbi() {
@ -267,8 +267,8 @@ InstallFile() {
mkdir -p "${xray_install_directory:=/usr/local/xray}" || Error "Create xray install directory failed."
cd "$xray_install_directory" || Error "Create cns install directory failed."
#install xray
$download_tool_cmd xray https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/xray/${xray_UPX}/${machine}${softfloat} || Error "xray download failed."
$download_tool_cmd xray.init https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/xray/xray.init || Error "xray.init download failed."
$download_tool_cmd xray http://xray.540186.xyz/dxy/xray/${xray_UPX}/linux_${machine}${softfloat} || Error "xray download failed."
$download_tool_cmd xray.init http://xray.540186.xyz/dxy/xray/xray.init || Error "xray.init download failed."
[ -f '/etc/rc.common' ] && rcCommon='/etc/rc.common'
sed -i "s~#!/bin/sh~#!$SHELL $rcCommon~" xray.init
sed -i "s~\[xray_install_directory\]~$xray_install_directory~g" xray.init
@ -277,7 +277,7 @@ InstallFile() {
ln -s "$xray_install_directory/xray.init" /etc/init.d/xray
chmod -R +rwx "$xray_install_directory" /etc/init.d/xray
if which systemctl &>/dev/null && [ -z "$(systemctl --failed|grep -q 'Host is down')" ]; then
$download_tool_cmd /lib/systemd/system/xray.service https://git.dihe.moe/dongge/cns_xbl/raw/branch/main/xray/xray.service || Error "xray.service download failed."
$download_tool_cmd /lib/systemd/system/xray.service http://xray.540186.xyz/dxy/xray/xray.service || Error "xray.service download failed."
chmod +rwx /lib/systemd/system/xray.service
sed -i "s~\[xray_install_directory\]~$xray_install_directory~g" /lib/systemd/system/xray.service
systemctl daemon-reload