sadly zerotier make-linux.mk does not support armv7; update service.sh

.github/workflows/build.yml

@@ -70,30 +70,30 @@ jobs:
           cd magisk
           zip -q -r ../zerotier-magisk-aarch64.zip .
 
-      - name: Build for arm
-        run: |
-          PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
-          PATH=`pwd`/libnatpmp:$PATH
-          NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
+      # - name: Build for arm
+      #   run: |
+      #     PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+      #     PATH=`pwd`/libnatpmp:$PATH
+      #     NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
 
-          CC=armv7a-linux-androideabi$api_version-clang
-          CXX=armv7a-linux-androideabi$api_version-clang++
+      #     CC=armv7a-linux-androideabi$api_version-clang
+      #     CXX=armv7a-linux-androideabi$api_version-clang++
 
-          cd libnatpmp
-          make clean
-          make CC=$CC natpmpc-shared
-          cd ..
+      #     cd libnatpmp
+      #     make clean
+      #     make CC=$CC natpmpc-shared
+      #     cd ..
 
-          cd ZeroTierOne
-          make clean
-          sed -i "s/armv7ve/armv7a/g" make-linux.mk
-          make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp" DEFS="-I../libnatpmp -D__GLIBC__=0"
-          cd ..
+      #     cd ZeroTierOne
+      #     make clean
+      #     sed -i "s/armv7ve/armv7a/g" make-linux.mk
+      #     make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp" DEFS="-I../libnatpmp -D__GLIBC__=0"
+      #     cd ..
 
-          cp ZeroTierOne/zerotier-one magisk/zerotier/
-          cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib
-          cd magisk
-          zip -q -r ../zerotier-magisk-arm.zip .
+      #     cp ZeroTierOne/zerotier-one magisk/zerotier/
+      #     cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib
+      #     cd magisk
+      #     zip -q -r ../zerotier-magisk-arm.zip .
 
       - name: Debugging with tmate
         uses: mxschmitt/action-tmate@v3.18

magisk/service.sh

@@ -13,16 +13,16 @@ log() {
   echo "[$t][$$][L] $1" >> $daemon_log
 }
 _stop() {
-  if [ $pid -eq -1 ]; then
-  log "zerotier-one not running"
+  pid=$(pidof zerotier-one)
+  if [ $? -ne 0 ]; then
+    log "zerotier-one not running"
     return 1
   fi
 
   kill -9 $pid
   ret=$?
-  pid=-1
-
-  echo $pid > ./run/pid
+  
+  rm -rf ./run/pid
 
   if [ $ret -eq 0 ]; then
     log "stopped zerotier-one"
@@ -73,7 +73,7 @@ __start() {
   echo $pid > ./run/pid
 }
 _start() {
-  if [ $pid -ne -1 ]; then
+  if pid=$(pidof zerotier-one); then
     log "zerotier-one already running"
   else
     __start