From: Chris Koeritz Date: Tue, 16 Oct 2018 00:22:54 +0000 (+0000) Subject: Merge branch 'master' of github.com:fredhamster/feisty_meow into dev X-Git-Tag: 2.140.115^2~87 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=3e92d9db9ab028fbb0d15915bff6e4514eb0a707;hp=e923243b547af94f05dfdb0d3f605c1edaff6a2d;p=feisty_meow.git Merge branch 'master' of github.com:fredhamster/feisty_meow into dev --- diff --git a/documentation/feisty_meow_dox.config b/documentation/feisty_meow_dox.config index 4c0f610d..1566a350 100644 --- a/documentation/feisty_meow_dox.config +++ b/documentation/feisty_meow_dox.config @@ -23,7 +23,7 @@ PROJECT_NAME = "feisty meow concerns codebase" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.108 +PROJECT_NUMBER = 2.140 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/graphiq/.settings/language.settings.xml b/graphiq/.settings/language.settings.xml index c6570713..0fb11ece 100644 --- a/graphiq/.settings/language.settings.xml +++ b/graphiq/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/infobase/configuration/mutt/dot.muttrc b/infobase/configuration/mutt/dot.muttrc new file mode 100644 index 00000000..df54bc76 --- /dev/null +++ b/infobase/configuration/mutt/dot.muttrc @@ -0,0 +1,10 @@ + +set mbox_type=Maildir + +set folder="~/Maildir" +set mbox="~/Maildir" +set spoolfile="~/Maildir" + + + + diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat index 3a9653fc..781643e5 100644 --- a/infobase/fortunes.dat +++ b/infobase/fortunes.dat @@ -43621,17 +43621,17 @@ And from bad teachers strive to keep your distance. Rest, Volume 1",  Translated by Padmakara Translation Group, published by Shambhala Publications ~ -Thinking about the self as composed of “aggregates” (Skt. skandha) can +Thinking about the self as composed of "aggregates" (Skt. skandha) can help us reflect on our personal identity in new ways. Generally, we attribute characteristics to our personal identity, feeling that it is solid, permanent, and real. But here, describing the self as being composed of aggregates can help us see ourselves more accurately. The word skandha can be translated -literally as “heap.” This definition, when applied to ourselves, can help +literally as "heap." This definition, when applied to ourselves, can help us see that we do not have a cohesive, real, and solid self. We are just a heap of stuff — flesh, blood, veins, nerves, bones, hair, cartilage, and so on. When we sort through this heap, what are we actually? None of the -elements of the heap is actually “me.” We are a mere mishmash of material -conditions that we have identified with and labeled “I.” +elements of the heap is actually "me." We are a mere mishmash of material +conditions that we have identified with and labeled "I." -- Anyen Rinpoche and Allison Choying Zangmo, in "Stop Biting the Tail You're Chasing: Using Buddhist Mind Training to Free Yourself from Painful Emotional Patterns" published by Shambhala Publications @@ -43649,4 +43649,37 @@ for the ways in which your tradition has come down to you with so much care.   -- Elizabeth Mattis Namgyel, from "The Logic of Faith: The Buddhist Approach to Finding Certainty Beyond Belief and Doubt", published by Shambhala Publications - +~ +If we are attached to a thought, it becomes an obstacle to the development of +our meditation or samadhi. The remedies for reducing attachments to thoughts +are called "pacification" and "taming the mind," which involve what to +do when we are unwilling to let go of thoughts. Normally we regard thoughts, +and especially certain thoughts, as either particularly important or +particularly pleasant and therefore worthwhile or entertaining. However, in +meditation, thoughts are nothing other than impediments to what we are trying +to do. So, when we are practicing meditation, we have to maintain the +attitude, "This is my time to meditate and now I am not trying to think +thoughts. If I let myself think, I am wasting this time I have to practice." +  -- Khenchen Thrangu, from "The Mahamudra Lineage Prayer: A Guide to + Practice", published by Shambhala Publications +~ +The arrogant mind never stops searching for identity, and this identity always +defines itself through attributes: "the beautiful one," "the smart one," +"the creative one," "the successful one." Sometimes we take this further by +creating a more elaborate persona: "the rebel," "the maverick," "the suffering +artist," "the fearless leader." We can hold onto these labels on a "good" day. +But when we feel insecure about our attributes, or our lack thereof, we start +to wonder how to define ourselves; we wonder who it is we really are. +Regardless of whether we’re having a good day or a low self-esteem day, the +point is, we haven’t found a way to relax, to be natural, unself-conscious. +We don’t know how to take our seat in ordinariness and feel comfortable in +our own skin. We’re always searching for something to be.    +  -- Dzigar Kongtrul, from "Light Comes Through: Buddhist Teachings on + Awakening to Our Natural Intelligence", published by Shambhala + Publications +~ +Vote Democrat 2018 +It's time for the adults to take back the wheel +We know our ABCS... +Apple Pie, Baseball, Compassion, & Science + -- fred t. hamster diff --git a/nucleus/.settings/language.settings.xml b/nucleus/.settings/language.settings.xml index 0d6789c9..c031c3c4 100644 --- a/nucleus/.settings/language.settings.xml +++ b/nucleus/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/nucleus/applications/utilities/dirtree.cpp b/nucleus/applications/utilities/dirtree.cpp index 80156b38..fe139dea 100644 --- a/nucleus/applications/utilities/dirtree.cpp +++ b/nucleus/applications/utilities/dirtree.cpp @@ -38,10 +38,20 @@ public: int execute(); int print_instructions_and_exit() { LOG(a_sprintf("\ -%s: This utility requires a directory name on the command line.\n\ -The subdirectories under that directory will be shown. If a second paramter\n\ -is provided, it is taken as a pattern that will be used to show the files in\n\ -those directories also. Otherwise, just the tree of directories is shown.\n\ +%s: This utility shows the sub-directory structure for a chosen directory.\n\ +It expects a directory name to be provided on the command line. If no\n\ +directory is provided, then the current directory is assumed. The sub-\n\ +directories under the chosen directory will be displayed on the console in a\n\ +stylized textual tree. If a second parameter is provided, it is taken as a\n\ +file pattern that causes matching files to be displayed. Without a pattern,\n\ +just the directory tree is shown.\n\ +For example:\n\ + dirtree\n\ + => shows the directory structure of the current directory.\n\ + dirtree udon\n\ + => shows the structure of directory 'udon'\n\ + dirtree soba \"*.txt\"\n\ + => displays all text files and sub-directories of 'soba'\n\ ", filename(application::_global_argv[0]).basename().raw().s())); return 23; } @@ -58,20 +68,30 @@ astring hier_prefix(int depth, int kids) int dirtree::execute() { astring path; - - - if (application::_global_argc < 2) { - return print_instructions_and_exit(); - } - - path = application::_global_argv[1]; +//hmmm: we really need an abstraction to do some checking if they want --help; +// this comparison way of doing it is lame. +astring helpword = astring("--help"); + + if (application::_global_argc <= 1) { + // plug in our default path if they gave us no parameters. + path = "."; + } else { + // they gave us some parameters. but are they asking for help? + if (helpword == astring(application::_global_argv[1])) { + return print_instructions_and_exit(); + } else { + // this seems like a serious path request. + path = application::_global_argv[1]; + } + } // check if we should show any of the files. bool show_files = false; astring pattern; - if (application::_global_argc >= 3) + if (application::_global_argc >= 3) { pattern = application::_global_argv[2]; + } if (pattern.t()) { show_files = true; } @@ -83,7 +103,7 @@ int dirtree::execute() if (!dir.good()) { continuable_error(class_name(), "tree construction", "the directory could not be read"); - return 82; + return print_instructions_and_exit(); } dir_tree_iterator *ted = dir.start(directory_tree::prefix); @@ -99,8 +119,9 @@ int dirtree::execute() directory_tree::depth(*ted, depth); directory_tree::children(*ted, kids); astring name_to_log = curr.basename().raw(); - if (!depth) + if (!depth) { name_to_log = curr.raw(); + } LOG(hier_prefix(depth, kids) + name_to_log); if (show_files) { astring names; @@ -108,6 +129,10 @@ int dirtree::execute() if (names.length()) { astring split; string_manipulation::split_lines(names, split, depth * 2 + 2); + // strip eol chars off the string we got back, since we already add that in log. + while (parser_bits::is_eol(split[split.end()])) { + split.zap(split.end(), split.end()); + } LOG(split); } } diff --git a/scripts/agenda/info_overload_report.sh b/scripts/agenda/info_overload_report.sh index 0616d0f4..225efa25 100644 --- a/scripts/agenda/info_overload_report.sh +++ b/scripts/agenda/info_overload_report.sh @@ -2,7 +2,7 @@ # these metrics are how bogged down we are in to-do type items. # logged historical file where we append our latest report. -REPORT_FILE="$HOME/cloud/magic_cabinet/fred/task_stats/overload_history.txt" +REPORT_FILE="$HOME/cloud/stats/overload_history.txt" # given a path, this will find how many items are under it, ignoring svn and git files, plus # other patterns we happen to notice are not useful. diff --git a/scripts/customize/fred/fred_common.alias b/scripts/customize/fred/fred_common.alias index 37b085e4..59c0c6bc 100644 --- a/scripts/customize/fred/fred_common.alias +++ b/scripts/customize/fred/fred_common.alias @@ -4,6 +4,8 @@ # updates the mounted barkuptree drive with stuff on wildmutt. define_yeti_alias update_barkuptree='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/media/fred/barkuptreedrive"' +# updates buffalonious when mounted. +define_yeti_alias update_buffalonious='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/z/buffalonious"' # updates local archive drive called catfurnose. define_yeti_alias update_catfurnose='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/media/fred/catfurnose"' diff --git a/scripts/customize/fred/scripts/games/gamesaver.sh b/scripts/customize/fred/scripts/games/gamesaver.sh index 764ab6c5..2beec56d 100644 --- a/scripts/customize/fred/scripts/games/gamesaver.sh +++ b/scripts/customize/fred/scripts/games/gamesaver.sh @@ -5,15 +5,15 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" -#we are missing the netcp thing. why???? +WINE_GOODS_DIR="$HOME/wine_goods" +if [ ! -d "$WINE_GOODS_DIR" ]; then + WINE_GOODS_DIR="/cygdrive/c/users/fred/My Documents" +fi -WINE_SOURCE_DIR="$HOME/wine_goods/My Games" +WINE_GAMES_DIR="$WINE_GOODS_DIR/My Games" SPOOLING_OUTPUT_DIR="$HOME/data/spooling_saves" -if [ ! -d "$WINE_SOURCE_DIR" ]; then - WINE_SOURCE_DIR="/cygdrive/c/users/fred/My Documents/My Games" -fi -if [ ! -d "$WINE_SOURCE_DIR" ]; then +if [ ! -d "$WINE_GAMES_DIR" ]; then echo "Failing to find the game save directories." exit 1 fi @@ -32,32 +32,32 @@ function copyem() if [ -d "$source_dir" ]; then echo $game_name -#old cp -v -n "$source_dir"/* "$out_dir"/ + if [ ! -d "$out_dir" ]; then + mkdir -p "$out_dir" + exit_on_error "Creating storage dir: $out_dir" + fi netcp "$source_dir"/* "$out_dir"/ sep 28 fi } -# make the output folders if they don't exist. -for i in skyrim fallout_new_vegas fallout_3 oblivion fallout_4 ; do - if [ ! -d "$SPOOLING_OUTPUT_DIR/$i" ]; then - mkdir -p "$SPOOLING_OUTPUT_DIR/$i" - fi -done +############## # now run through and copy our save files from the potentially weird locations # they reside in. sep 28 -copyem "skyrim" "$WINE_SOURCE_DIR/Skyrim/Saves" "$SPOOLING_OUTPUT_DIR/skyrim" +copyem "skyrim" "$WINE_GAMES_DIR/Skyrim/Saves" "$SPOOLING_OUTPUT_DIR/skyrim" + +copyem "fallout new vegas" "$WINE_GAMES_DIR/FalloutNV/Saves" "$SPOOLING_OUTPUT_DIR/fallout_new_vegas" -copyem "fallout new vegas" "$WINE_SOURCE_DIR/FalloutNV/Saves" "$SPOOLING_OUTPUT_DIR/fallout_new_vegas" +copyem "fallout 3" "$WINE_GAMES_DIR/Fallout3/Saves" "$SPOOLING_OUTPUT_DIR/fallout_3" -copyem "fallout 3" "$WINE_SOURCE_DIR/Fallout3/Saves" "$SPOOLING_OUTPUT_DIR/fallout_3" +copyem "oblivion" "$WINE_GAMES_DIR/Oblivion/Saves" "$SPOOLING_OUTPUT_DIR/oblivion/" -copyem "oblivion" "$WINE_SOURCE_DIR/Oblivion/Saves" "$SPOOLING_OUTPUT_DIR/oblivion/" +copyem "fallout 4" "$WINE_GAMES_DIR/Fallout4/Saves" "$SPOOLING_OUTPUT_DIR/fallout_4" -copyem "fallout 4" "$WINE_SOURCE_DIR/Fallout4/Saves" "$SPOOLING_OUTPUT_DIR/fallout_4" +copyem "witcher 3" "$WINE_GOODS_DIR/The Witcher 3/gamesaves" "$SPOOLING_OUTPUT_DIR/witcher_3" diff --git a/scripts/customize/fred/scripts/games/zap_witcher.sh b/scripts/customize/fred/scripts/games/zap_witcher.sh new file mode 100644 index 00000000..e3901b22 --- /dev/null +++ b/scripts/customize/fred/scripts/games/zap_witcher.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# windows compatible process killer for any stray processes started as +# "witcher" something. + +source $FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh + +procid="$( psa witcher | tail -n 1 | awk '{ print $1; }' )" + +if [ ! -z "$procid" ]; then + taskkill.exe /f /pid ${procid} +fi diff --git a/scripts/marks/create_marks.sh b/scripts/marks/create_marks.sh index ab9f2669..a1ae5db2 100644 --- a/scripts/marks/create_marks.sh +++ b/scripts/marks/create_marks.sh @@ -46,5 +46,5 @@ if [ $? != 0 ]; then fi \mv -f $genlinx $genlinx_moz $genlinx_js $GRUNTOSE_DIR/Info/Twain -\mv -f $newmarx $TMP +#not needed: \mv -f $newmarx $HOME diff --git a/scripts/tty/terminal_titler.sh b/scripts/tty/terminal_titler.sh index 7ced5c9f..939c1cce 100644 --- a/scripts/tty/terminal_titler.sh +++ b/scripts/tty/terminal_titler.sh @@ -45,18 +45,36 @@ function set_terminal_title() # echoes back the current title on the terminal window, if we can acquire it. function get_terminal_title() { +#hmmm: totally failing since gnome doesn't provide the info we need like it should; WINDOWID is empty. +#hmmm: need to revise this somehow to work around that, but nothing is quite right so far. +#hmmm: had to disable the xwininfo approach because it's super messy (console noise) and still isn't right (just like xdotool approach wasn't right). + # this is an important value now; it is checked for in save_terminal_title. local term_title_found="unknown" # save the former terminal title if we're running in X with xterm. - which xprop &>/dev/null - if [ $? -eq 0 ]; then - # gnome-terminal doesn't set WINDOWID currently, but we can work around this. - if [[ -z "$WINDOWID" && ! -z "$(which xwininfo)" ]]; then -#not good solution. term_title_found="$(xprop -id $(xdotool getactivewindow) | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')" - term_title_found=$(xwininfo -id $(xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }') | awk -F\" '/xwininfo:/ { print $2; exit }') - # check if we're actually using xterm *and* that we have a window ID. - elif [[ "$TERM" =~ .*"xterm".* && ! -z "$WINDOWID" ]]; then - term_title_found="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')" + + # are we even running a terminal? +#hmmm: abstract out that condition below to check against a list of names. + if [[ "$TERM" =~ .*"xterm".* ]]; then + # check that we have a window ID. + if [[ ! -z "$WINDOWID" ]]; then + # the window id exists in the variable; can we get its info? + if [[ ! -z "$(which xprop)" ]]; then + # sweet, we have all the info we need to get this done. + term_title_found="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')" + fi + else + # gnome-terminal doesn't set WINDOWID currently; we can try to work around this. + false +#hmmm: so far, none of these approaches are any good. +# # not good solution; gets wrong titles. plus uses xdotool which is not installed by default in ubuntu. +# if [[ ! -z "$(which xdotool)" ]]; then +# term_title_found="$(xprop -id $(xdotool getactivewindow) | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')" +# fi +# # this solution also fails by getting the wrong window title if this one isn't focussed. +# if [[ ! -z "$(which xwininfo)" ]]; then +# term_title_found=$(xwininfo -id $(xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }') | awk -F\" '/xwininfo:/ { print $2; exit }') +# fi fi fi echo -n "$term_title_found"