From 43d671a278a6f7dc0d831541d0992bc00eb23ee8 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 6 Jun 2016 15:33:35 -0400 Subject: [PATCH] dropped old commented code for windoze --- scripts/core/functions.sh | 59 ++++++--------------------------------- 1 file changed, 9 insertions(+), 50 deletions(-) diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index b5bbf95d..21d9d047 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -153,65 +153,24 @@ if [ -z "$skip_all" ]; then local pid_finder_pattern='s/^[[:space:]]*\([0-9][0-9]*\).*$/\1/p' fi - -# if [ "$OS" == "Windows_NT" ]; then -# -##hmmm: windows isn't implementing the user flag yet! -##try collapsing back to the ps implementation from cygwin? -## that would simplify things a lot, if we can get it to print the right output. -# -# # windows case has some odd gyrations to get the user list. -# if [ ! -d c:/tmp ]; then -# mkdir c:/tmp -# fi -# # windows7 magical mystery tour lets us create a file c:\\tmp_pids.txt, but then it's not -# # really there in the root of drive c: when we look for it later. hoping to fix that -# # problem by using a subdir, which also might be magical thinking from windows perspective. -# tmppid=c:\\tmp\\pids.txt -# # we have abandoned all hope of relying on ps on windows. instead we use wmic to get full -# # command lines for processes. -# wmic /locale:ms_409 PROCESS get processid,commandline "$tmppid" -# local flag='/c' -# if [ ! -z "$(uname -a | grep "^MING" )" ]; then -# flag='//c' -# fi -# # we 'type' the file to get rid of the unicode result from wmic. -# # needs to be a windows format filename for 'type' to work. -# cmd $flag type "$tmppid" >$PID_DUMP -# \rm "$tmppid" -# local pid_finder_pattern='s/^.*[[:space:]][[:space:]]*\([0-9][0-9]*\) *\$/\1/p' -# local i -# for i in "${patterns[@]}"; do -# PIDS_SOUGHT+=($(cat $PID_DUMP \ -# | grep -i "$i" \ -# | sed -n -e "$pid_finder_pattern")) -# done -# else - - - /bin/ps $EXTRA_DOZER_FLAGS $EXTRA_UNIX_FLAGS $user_flag | tail -n +2 >$PID_DUMP + /bin/ps $EXTRA_DOZER_FLAGS $EXTRA_UNIX_FLAGS $user_flag | tail -n +2 >$PID_DUMP #echo ==== #echo got all this stuff in the pid dump file: #cat $PID_DUMP #echo ==== - # remove the first line of the file, search for the pattern the - # user wants to find, and just pluck the process ids out of the - # results. - local i - for i in "${patterns[@]}"; do -#echo pattern is $i -#echo phase 1: $(cat $PID_DUMP | sed -e '1d' ) -#echo phase 2: $(cat $PID_DUMP | sed -e '1d' | grep -i "$i" ) - PIDS_SOUGHT+=($(cat $PID_DUMP \ - | grep -i "$i" \ - | sed -n -e "$pid_finder_pattern")) - done + # search for the pattern the user wants to find, and just pluck the process + # ids out of the results. + local i + for i in "${patterns[@]}"; do + PIDS_SOUGHT+=($(cat $PID_DUMP \ + | grep -i "$i" \ + | sed -n -e "$pid_finder_pattern")) + done #echo ==== #echo pids sought list became: #echo "${PIDS_SOUGHT[@]}" #echo ==== -##### fi if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then local PIDS_SOUGHT2=$(printf -- '%s\n' ${PIDS_SOUGHT[@]} | sort | uniq) -- 2.34.1