From f5fb475343cad13f8a93b4134699e11c181f87ac Mon Sep 17 00:00:00 2001 From: albfan Date: Fri, 3 Jul 2015 18:54:25 +0200 Subject: [PATCH] fix script wrappers Avoid kill-wpa.sh to exit script when sourced and there is no wpa_supplicant connection Avoid false positives on wpa_supplicant detection --- res/kill-wpa.sh | 5 ++++- res/miracle-utils.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/res/kill-wpa.sh b/res/kill-wpa.sh index c4f2c8a..e210b8f 100755 --- a/res/kill-wpa.sh +++ b/res/kill-wpa.sh @@ -11,5 +11,8 @@ then sudo kill -9 $WPA_PID else echo cannot find wpa_supplicant connection to kill - exit 1 + if [[ $_ == $0 ]] + then + exit 1 + fi fi diff --git a/res/miracle-utils.sh b/res/miracle-utils.sh index 1d9ff4d..e77fff0 100755 --- a/res/miracle-utils.sh +++ b/res/miracle-utils.sh @@ -78,7 +78,7 @@ function search_p2p_capabilities { # show wpa_supplicant command # function show_wpa_supplicant_process { - ps -ef | grep wpa_supplican[t] + ps -ef | grep "wpa_supplican[t] " } #