X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=3024f8200ece981d94c4eb1fd52eaeab8400d18d;hb=b7e7550f69bdb2e89d1640cdcc48d17b85520d05;hp=9740d2a158d70fdf2100f4a79d7f10b3fd4e97b6;hpb=9ee7dffcc391a9f8660c26a7a7138c831abb4b09;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 9740d2a1..3024f820 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -77,7 +77,6 @@ if [ -z "$skip_all" ]; then # locates a process given a search pattern to match in the process list. function psfind() { local -a patterns=("${@}") - mkdir $TEST_TEMP/grid_logs &>/dev/null local PID_DUMP="$(mktemp "$TMP/zz_pidlist.XXXXXX")" local -a PIDS_SOUGHT if [ "$OS" == "Windows_NT" ]; then @@ -102,7 +101,7 @@ if [ -z "$skip_all" ]; then # local CR=' #' # embedded carriage return. # local appropriate_pattern="s/^.* *\([0-9][0-9]*\)[ $CR]*\$/\1/p" - local appropriate_pattern="s/^.* *\([0-9][0-9]*\)*\$/\1/p" + local appropriate_pattern="s/^.* *\([0-9][0-9]*\) *\$/\1/p" for i in "${patterns[@]}"; do PIDS_SOUGHT+=($(cat $PID_DUMP \ | grep -i "$i" \ @@ -138,13 +137,13 @@ if [ -z "$skip_all" ]; then echo "psa finds processes by pattern, but there was no pattern on the command line." return 1 fi - p=$(psfind "$1") + p=$(psfind "${@}") if [ -z "$p" ]; then # no matches. return 0 fi echo "" - echo "Processes containing \"$1\"..." + echo "Processes matching ${@}..." echo "" if [ -n "$IS_DARWIN" ]; then unset fuzil_sentinel