Browse Source

Merge pull request #1624 from erikh/silence-entrypoint-errors

silence catting files that don't exist in docker entrypoint
Erik Hollensbe 3 years ago
parent
commit
cade483a00
1 changed files with 2 additions and 2 deletions
  1. 2 2
      entrypoint.sh.release

+ 2 - 2
entrypoint.sh.release

@@ -1,7 +1,7 @@
 #!/bin/sh
 #!/bin/sh
 
 
 grepzt() {
 grepzt() {
-  [ -f /var/lib/zerotier-one/zerotier-one.pid -a -n "$(cat /var/lib/zerotier-one/zerotier-one.pid)" -a -d "/proc/$(cat /var/lib/zerotier-one/zerotier-one.pid)" ]
+  [ -f /var/lib/zerotier-one/zerotier-one.pid -a -n "$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" -a -d "/proc/$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" ]
   return $?
   return $?
 }
 }
 
 
@@ -34,7 +34,7 @@ mkztfile zerotier-one.port 0600 "9993"
 
 
 killzerotier() {
 killzerotier() {
   echo "Killing zerotier"
   echo "Killing zerotier"
-  kill $(cat /var/lib/zerotier-one/zerotier-one.pid)  
+  kill $(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)
   exit 0
   exit 0
 }
 }