From 35c22eba616a713c890a8c1488f463d1787adee0 Mon Sep 17 00:00:00 2001
From: eventlOwOp <3064273390@qq.com>
Date: Sat, 11 May 2024 16:01:47 +0800
Subject: [PATCH] fix service.sh pattern recognition

---
 .github/workflows/build-gcc.yml | 4 ++--
 magisk/customize.sh             | 1 -
 magisk/service.sh               | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-gcc.yml b/.github/workflows/build-gcc.yml
index cef6a17..9956ad4 100644
--- a/.github/workflows/build-gcc.yml
+++ b/.github/workflows/build-gcc.yml
@@ -53,7 +53,7 @@ jobs:
           cd ..
 
           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 ..
 
           mkdir -p magisk/zerotier/lib
@@ -78,7 +78,7 @@ jobs:
           cd ZeroTierOne
           make clean
           # 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 ..
 
           cp ZeroTierOne/zerotier-one magisk/zerotier/
diff --git a/magisk/customize.sh b/magisk/customize.sh
index cf04d05..fa428ad 100644
--- a/magisk/customize.sh
+++ b/magisk/customize.sh
@@ -14,7 +14,6 @@ ui_print "- set file permission"
 set_perm_recursive ${MODPATH}/zerotier 0 0 0755 0755
 
 ui_print "- create work dir"
-rm -rf ${ZT_PATH}
 mkdir -p ${ZT_PATH}
 mkdir ${ZT_PATH}/run ${ZT_PATH}/home
 mv ${MODPATH}/zerotier/* ${ZT_PATH}
diff --git a/magisk/service.sh b/magisk/service.sh
index 598dda5..f867eb0 100644
--- a/magisk/service.sh
+++ b/magisk/service.sh
@@ -89,6 +89,8 @@ ip rule add from all lookup main pref 1
 export LD_LIBRARY_PATH=/data/adb/zerotier/lib
 
 __start
+sleep 1
+_join
 
 rm -f $pipe
 mkfifo $pipe
@@ -97,7 +99,7 @@ while true
 do
   if read line < $pipe; then
     log "received commad $line"
-    case line in
+    case "$line" in
       "quit")
         log "stopped"
         break;;