X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=ab883d9d6e6bce61ced2ffb806a2d352595262e3;hb=5e22301c1dab2d8fb437c02d1adeb823bfcd972a;hp=f6a9beb37fb55dccc23253001d11b84026d221ab;hpb=1915a56e69a320fa3a3c2d944cf120f2c958e287;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index f6a9beb3..ab883d9d 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -33,6 +33,35 @@ if [ -z "$skip_all" ]; then cd "$1" } + # displays the value of a variable in bash friendly format. + function var() { + while true; do + local varname="$1"; shift + if [ -z "$varname" ]; then + break + fi + if [ -z "${!varname}" ]; then + echo "$varname undefined" + else + echo "$varname=${!varname}" + fi + done + } + + function success_sound() + { + if [ ! -z "$CLAM_FINISH_SOUND" ]; then + bash $FEISTY_MEOW_SCRIPTS/multimedia/sound_play.sh "$CLAM_FINISH_SOUND" + fi + } + + function error_sound() + { + if [ ! -z "$CLAM_ERROR_SOUND" ]; then + bash $FEISTY_MEOW_SCRIPTS/multimedia/sound_play.sh "$CLAM_ERROR_SOUND" + fi + } + # checks the result of the last command that was run, and if it failed, # then this complains and exits from bash. the function parameters are # used as the message to print as a complaint. @@ -40,28 +69,28 @@ if [ -z "$skip_all" ]; then { if [ $? -ne 0 ]; then echo -e "failed on: $*" + error_sound exit 1 fi } # 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 PIDS_SOUGHT=() - local patterns=($*) + local -a PIDS_SOUGHT if [ "$OS" == "Windows_NT" ]; then # needs to be a windows format filename for 'type' to work. 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. + # 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. - # this does not exist on windows home edition. we are hosed if that's - # what they insist on testing on. + # 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 @@ -70,18 +99,14 @@ if [ -z "$skip_all" ]; then # we 'type' the file to get rid of the unicode result from wmic. cmd $flag type "$tmppid" >$PID_DUMP \rm "$tmppid" - local CR=' ' # embedded carriage return. - local appropriate_pattern="s/^.* *\([0-9][0-9]*\)[ $CR]*\$/\1/p" +# 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" for i in "${patterns[@]}"; do - PIDS_SOUGHT+=$(cat $PID_DUMP \ + PIDS_SOUGHT+=($(cat $PID_DUMP \ | grep -i "$i" \ - | sed -n -e "$appropriate_pattern") - if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then - # we want to bail as soon as we get matches, because on the same - # platform, the same set of patterns should work to find all - # occurrences of the genesis java. - break; - fi + | sed -n -e "$appropriate_pattern")) done else /bin/ps $extra_flags wuax >$PID_DUMP @@ -91,19 +116,18 @@ if [ -z "$skip_all" ]; then # user wants to find, and just pluck the process ids out of the # results. for i in "${patterns[@]}"; do - PIDS_SOUGHT=$(cat $PID_DUMP \ + PIDS_SOUGHT+=($(cat $PID_DUMP \ | sed -e '1d' \ | grep -i "$i" \ - | sed -n -e "$appropriate_pattern") - if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then - # we want to bail as soon as we get matches, because on the same - # platform, the same set of patterns should work to find all - # occurrences of the genesis java. - break; - fi + | sed -n -e "$appropriate_pattern")) done fi - if [ ! -z "$PIDS_SOUGHT" ]; then echo "$PIDS_SOUGHT"; fi + if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then + local PIDS_SOUGHT2=$(printf -- '%s\n' ${PIDS_SOUGHT[@]} | sort | uniq) + PIDS_SOUGHT=() + PIDS_SOUGHT=${PIDS_SOUGHT2[*]} + echo ${PIDS_SOUGHT[*]} + fi /bin/rm $PID_DUMP } @@ -114,13 +138,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 @@ -230,7 +254,7 @@ if [ -z "$skip_all" ]; then # label if they're doing an su with the sudo. function sudo() { local first_command="$1" - /usr/bin/sudo $* + /usr/bin/sudo "$@" if [ "$first_command" == "su" ]; then # yep, they were doing an su, but they're back now. bash $FEISTY_MEOW_SCRIPTS/tty/label_terminal_with_infos.sh @@ -342,6 +366,8 @@ if [ -z "$skip_all" ]; then sed -i -e "s%$pattern%$replacement%g" "$file" } + ############## + function function_sentinel() { return 0; } if [ ! -z "$SHELL_DEBUG" ]; then echo function definitions end....; fi