ソースを参照

Don't include grep

Bob Mottram 9 年 前
コミット
63745b2616
共有1 個のファイルを変更した8 個の追加4 個の削除を含む
  1. 8
    4
      src/freedombone-client

+ 8
- 4
src/freedombone-client ファイルの表示

@@ -406,10 +406,14 @@ function mesh_batman {
406 406
   echo '    fi' >> $batman_script
407 407
   echo '' >> $batman_script
408 408
   echo '    # kill processes' >> $batman_script
409
-  echo '    zeronet_proc=$(ps aux | grep zeronet | awk -F " " "{print $2}" | head -n1)' >> $batman_script
410
-  echo '    kill -9 $zeronet_proc > /dev/null' >> $batman_script
411
-  echo '    tracker_proc=$(ps aux | grep bttrack | awk -F " " "{print $2}" | head -n1)' >> $batman_script
412
-  echo '    kill -9 $tracker_proc > /dev/null' >> $batman_script
409
+  echo '    zeronet_proc=$(ps aux | grep zeronet | grep -v grep | awk -F " " "{print $2}" | head -n1)' >> $batman_script
410
+  echo '    if [ $zeronet_proc ]; then' >> $batman_script
411
+  echo '        kill -9 $zeronet_proc 2> /dev/null' >> $batman_script
412
+  echo '    fi' >> $batman_script
413
+  echo '    tracker_proc=$(ps aux | grep bttrack | grep -v grep | awk -F " " "{print $2}" | head -n1)' >> $batman_script
414
+  echo '    if [ $tracker_proc ]; then' >> $batman_script
415
+  echo '        kill -9 $tracker_proc 2> /dev/null' >> $batman_script
416
+  echo '    fi' >> $batman_script
413 417
   echo '' >> $batman_script
414 418
   echo '    ' >> $batman_script
415 419
   echo '    rm -f /tmp/meshtype' >> $batman_script