X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=fe56aea63a2624d73f5603b55264d0aa56064444;hb=9fea38a41a34634d09c9337ac060b80bc3c8730f;hp=c4571b994a34096ae329b180c3f287e385904936;hpb=9fc7789410242e3e4d0aa38eac172e28ba51525a;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index c4571b99..fe56aea6 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -21,7 +21,9 @@ if [ -z "$skip_all" ]; then # a handy little method that can be used for date strings. it was getting # really tiresome how many different ways the script did the date formatting. function date_stringer() { - date +"%Y_%m_%d_%H%M_%S" | tr -d '/\n/' + local sep="$1"; shift + if [ -z "$sep" ]; then sep='_'; fi + date +"%Y$sep%m$sep%d$sep%H%M$sep%S" | tr -d '/\n/' } # makes a directory of the name specified and then tries to change the @@ -38,7 +40,13 @@ if [ -z "$skip_all" ]; then local patterns=($*) if [ "$OS" == "Windows_NT" ]; then # needs to be a windows format filename for 'type' to work. - local tmppid=c:\\tmp_pids.txt + 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. # this does not exist on windows home edition. we are hosed if that's @@ -51,15 +59,16 @@ 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 appropriate_pattern='s/^.* *\([0-9][0-9]*\) *$/\1/p' + local CR=' ' # embedded carriage return. + local appropriate_pattern="s/^.* *\([0-9][0-9]*\)[ $CR]*\$/\1/p" for i in "${patterns[@]}"; do 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. + # 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 done @@ -76,9 +85,9 @@ if [ -z "$skip_all" ]; then | 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. + # 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 done @@ -90,36 +99,42 @@ if [ -z "$skip_all" ]; then # finds all processes matching the pattern specified and shows their full # process listing (whereas psfind just lists process ids). function psa() { + if [ -z "$1" ]; then + echo "psa finds processes by pattern, but there was no pattern on the command line." + return 1 + fi p=$(psfind "$1") - if [ ! -z "$p" ]; then - echo "" - echo "Processes containing \"$1\"..." - echo "" - if [ -n "$IS_DARWIN" ]; then - unset fuzil_sentinel - for i in $p; do - # only print the header the first time. - if [ -z "$fuzil_sentinel" ]; then - ps $i -w -u - else - ps $i -w -u | sed -e '1d' - fi - fuzil_sentinel=true - done - else - # cases besides darwin OS (for macs). - extra_flags= - if [ "$OS" = "Windows_NT" ]; then - # special case for windows. - extra_flags=-W - ps | head -1 - for curr in $p; do - ps $extra_flags | grep "^ *$curr" - done + if [ -z "$p" ]; then + # no matches. + return 0 + fi + echo "" + echo "Processes containing \"$1\"..." + echo "" + if [ -n "$IS_DARWIN" ]; then + unset fuzil_sentinel + for i in $p; do + # only print the header the first time. + if [ -z "$fuzil_sentinel" ]; then + ps $i -w -u else - # normal OSes can handle a nice simple query. - ps wu $p + ps $i -w -u | sed -e '1d' fi + fuzil_sentinel=true + done + else + # cases besides mac os x's darwin. + extra_flags= + if [ "$OS" = "Windows_NT" ]; then + # special case for windows. + extra_flags=-W + ps | head -1 + for curr in $p; do + ps $extra_flags | grep "$curr" + done + else + # normal OSes can handle a nice simple query. + ps wu $p fi fi } @@ -141,10 +156,10 @@ if [ -z "$skip_all" ]; then sudo /etc/init.d/alsasound restart } - # switches from a /X/path form to an X:/ form. + # switches from a /X/path form to an X:/ form. this also processes cygwin paths. function msys_to_dos_path() { # we always remove dos slashes in favor of forward slashes. - echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\/\([a-zA-Z]\)\/\(.*\)/\1:\/\2/' + echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\/cygdrive//' | sed -e 's/\/\([a-zA-Z]\)\/\(.*\)/\1:\/\2/' } # switches from an X:/ form to an /X/path form. @@ -196,26 +211,6 @@ if [ -z "$skip_all" ]; then fi } - # buntar is a long needed uncompressing macro that feeds into tar -x. - # it takes a list of bz2 file names and extracts their contents into - # sequentially numbered directories. - function buntar() { - index=1 - for i in $*; do - mkdir buntar_$index - pushd buntar_$index &>/dev/null - file=$i - # if the filename has no directory component, we will assume it used to - # be above our unzipping directory here. - if [ "$(basename $file)" = $file ]; then - file=../$file - fi - bunzip2 -d -c $file | tar -xf - - popd &>/dev/null - index=$(expr $index + 1) - done - } - # trashes the .#blah files that cvs and svn leave behind when finding conflicts. # this kind of assumes you've already checked them for any salient facts. function clean_cvs_junk() { @@ -223,20 +218,25 @@ if [ -z "$skip_all" ]; then find $i -follow -type f -iname ".#*" -exec perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl {} ";" done } - - # recreates all the generated files that the feisty meow scripts use. - function regenerate() { - bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh - echo + + # overlay for nechung binary so that we can complain less grossly about it when it's missing. + function nechung() { local wheres_nechung=$(which nechung 2>/dev/null) if [ -z "$wheres_nechung" ]; then echo "The nechung oracle program cannot be found. You may want to consider" echo "rebuilding the feisty meow applications with this command:" echo " bash $FEISTY_MEOW_DIR/scripts/generator/bootstrap_build.sh" else - nechung + $wheres_nechung fi } + + # recreates all the generated files that the feisty meow scripts use. + function regenerate() { + bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh + echo + nechung + } function function_sentinel() { return 0; }