jzy/zerotier-magisk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix service.sh pattern recognition

Browse Source
This commit is contained in:
eventlOwOp
2024-05-11 16:01:47 +08:00
parent 2182f8d2d2
commit 35c22eba61
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-gcc.yml
+2 -2
View File
@@ -53,7 +53,7 @@ jobs:
cd .. cd ..
cd ZeroTierOne cd ZeroTierOne
make --silent -j $(nproc) ZT_STATIC=1 ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp -s" DEFS="-I../libnatpmp" make --silent -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp -s" DEFS="-I../libnatpmp"
cd .. cd ..
mkdir -p magisk/zerotier/lib mkdir -p magisk/zerotier/lib
@@ -78,7 +78,7 @@ jobs:
cd ZeroTierOne cd ZeroTierOne
make clean make clean
# sed -i "s/armv7ve/armv7a/g" make-linux.mk # sed -i "s/armv7ve/armv7a/g" make-linux.mk
make -j $(nproc) ZT_STATIC=1 ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp -s" DEFS="-I../libnatpmp" make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp -s" DEFS="-I../libnatpmp"
cd .. cd ..
cp ZeroTierOne/zerotier-one magisk/zerotier/ cp ZeroTierOne/zerotier-one magisk/zerotier/
magisk/customize.sh
-1
View File
@@ -14,7 +14,6 @@ ui_print "- set file permission"
set_perm_recursive ${MODPATH}/zerotier 0 0 0755 0755 set_perm_recursive ${MODPATH}/zerotier 0 0 0755 0755
ui_print "- create work dir" ui_print "- create work dir"
rm -rf ${ZT_PATH}
mkdir -p ${ZT_PATH} mkdir -p ${ZT_PATH}
mkdir ${ZT_PATH}/run ${ZT_PATH}/home mkdir ${ZT_PATH}/run ${ZT_PATH}/home
mv ${MODPATH}/zerotier/* ${ZT_PATH} mv ${MODPATH}/zerotier/* ${ZT_PATH}
magisk/service.sh
+3 -1
View File
@@ -89,6 +89,8 @@ ip rule add from all lookup main pref 1
export LD_LIBRARY_PATH=/data/adb/zerotier/lib export LD_LIBRARY_PATH=/data/adb/zerotier/lib
__start __start
sleep 1
_join
rm -f $pipe rm -f $pipe
mkfifo $pipe mkfifo $pipe
@@ -97,7 +99,7 @@ while true
do do
if read line < $pipe; then if read line < $pipe; then
log "received commad $line" log "received commad $line"
case line in case "$line" in
"quit") "quit")
log "stopped" log "stopped"
break;; break;;