Skip to content

Commit 7abff93

Browse files
authored
Merge branch 'main' into dev
2 parents bbcef77 + 7714fd0 commit 7abff93

File tree

6 files changed

+37
-34
lines changed

6 files changed

+37
-34
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/target
22
/xunlei
33
.idea
4-
./bin
4+
./bin
5+
Cargo.lock

Cargo.lock

+27-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "xunlei"
3-
version = "3.5.2-1"
3+
version = "3.5.2-3"
44
edition = "2021"
55
description = "Synology Nas Thunder runs on Linux"
66
license = "MIT"

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ bash +x ./unpack.sh && cargo build --release --features embed && mv target/relea
8282
### OpenWrt编译
8383

8484
```shell
85-
svn co https://github.com/gngpp/nas-xunlei/trunk/openwrt package/xunlei
85+
cd package
86+
svn co https://github.com/gngpp/nas-xunlei/trunk/openwrt
87+
cd -
8688
make menuconfig # choose LUCI->Applications->Luci-app-xunlei
8789
make V=s
8890
```

openwrt/xunlei/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=xunlei
44

5-
PKG_VERSION:=3.5.2
6-
PKG_RELEASE:=2
5+
PKG_VERSION:=3.5.2-3
76

87
PKG_LICENSE:=MIT
98
PKG_MAINTAINER:=gngpp <[email protected]>

openwrt/xunlei/files/xunlei.init

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ start_service() {
3232

3333
rm -rf /var/packages/pan-xunlei-com
3434
mkdir -p /var/packages/pan-xunlei-com
35-
ln -s /usr/share/xunlei /var/packages/pan-xunlei-com
35+
36+
ln -s /usr/share/xunlei/target /var/packages/pan-xunlei-com
3637
ln -s /usr/share/xunlei/target/host/etc/synoinfo.conf /etc/synoinfo.conf
3738
ln -s /usr/share/xunlei/target/host/usr/syno/synoman/webman/modules/authenticate.cgi /usr/syno/synoman/webman/modules/authenticate.cgi
3839
args="--host $host --port $port --config-path $config_path --download-path $download_path"
@@ -50,7 +51,7 @@ service_triggers() {
5051

5152
reload_service() {
5253
stop
53-
for i in $(seq 1 20); do
54+
for i in $(seq 1 20); do
5455
if [ -z "$(ps -ef | grep xunlei | grep -v grep | grep -v $$ |grep -v '/etc/rc.common' | grep -v '/sbin/service' | grep -v '/sbin/luci-reload')" ]; then
5556
break
5657
fi

0 commit comments

Comments
 (0)