From: Chris Koeritz Date: Sat, 18 Feb 2012 18:57:42 +0000 (-0500) Subject: Merge branch 'master' of zooty:feisty_meow X-Git-Tag: 2.140.90~1596 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b7fac99d77474c4f2fc12647bbd96b04595e8a66;hp=1f61865ba0789a688349d28998b055417a5bd0b8;p=feisty_meow.git Merge branch 'master' of zooty:feisty_meow --- diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl index 998cc5f7..49257c79 100644 --- a/scripts/archival/shared_snarfer.pl +++ b/scripts/archival/shared_snarfer.pl @@ -337,7 +337,7 @@ sub snarf_by_pattern { $dir_for_hierarchy = $extra_component; } - @dir_contents = &glob_list("$dir$extra_piece/*$pattern*"); + @dir_contents = &glob_list("$dir_for_hierarchy$extra_piece/*$pattern*"); # print "dir contents: @dir_contents\n"; if (!scalar(@dir_contents)) { @@ -345,9 +345,11 @@ sub snarf_by_pattern { } foreach $item (@dir_contents) { +# print "considering backup hier of $item\n"; if ( ($item =~ /$pattern.*snarf/) || ($item =~ /$pattern.*tar/) ) { next; } if ( ! -d "$item" ) { next; } - &backup_hierarchy($prefix, $number, $dir, "$dir_for_hierarchy" . "/" . &basename($item)); +# print "now really planning to backup hier of $item\n"; + &backup_hierarchy($prefix, $number, $dir_for_hierarchy . $extra_piece, &basename($item)); } } diff --git a/scripts/archival/snarf_notes.pl b/scripts/archival/snarf_notes.pl index b8b3c9f1..1f58543b 100644 --- a/scripts/archival/snarf_notes.pl +++ b/scripts/archival/snarf_notes.pl @@ -50,8 +50,9 @@ local($snarf_file) = &snarf_name($snarf_file_base, $number); &snarf_by_pattern($snarf_file_base, "$root", "list"); &snarf_by_pattern($snarf_file_base, "$root", "task"); -# backup additional items from our Ubuntu One folder. -&snarf_by_pattern($snarf_file_base, "$root", "notes", "Ubuntu One"); +# backup additional folders we care about. +###ubuntu one retired because of complete unreliability. +#&snarf_by_pattern($snarf_file_base, "$root", "notes", "Ubuntu One"); ############################################################################ diff --git a/scripts/files/checker_report.sh b/scripts/files/checker_report.sh new file mode 100755 index 00000000..ce0bb6bd --- /dev/null +++ b/scripts/files/checker_report.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# checker_report: runs the checker utility against all files in a directory, +# in such a way that the file count can be very high without blowing its +# mind, and without any extra headers in the report. + +source $FEISTY_MEOW_SCRIPTS/core/functions.sh + +dirname="$1"; shift +outfile="$1"; shift # optional parm. + +if [ -z "$dirname" ]; then + echo "This script requires one directory on which to make a checker report." + exit 1 +fi + +if [ -z "$outfile" ]; then + outfile="$HOME/checker_report_$(hostname)_$(date_stringer).txt" +fi + +if [ -f "$outfile" ]; then + rm "$outfile" +fi + +temp_file_list="$(mktemp /tmp/file_list_temporary.XXXXXX)" + +find "$dirname" -type f >"$temp_file_list" +###-exec echo \"{}\" ';' +while read line; do + checker -q -b "$line" 2>&1 >>"$outfile" +done <"$temp_file_list" + + diff --git a/scripts/opensim/opensim_utils.sh b/scripts/opensim/opensim_utils.sh index 3e84b705..0f60a174 100644 --- a/scripts/opensim/opensim_utils.sh +++ b/scripts/opensim/opensim_utils.sh @@ -34,7 +34,7 @@ function launch_screen() screen_name="$1"; shift app_name="$1"; shift echo "$(mdate): starting $screen_name now..." - screen -L -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono "$app_name" + screen -L -S "$screen_name" -d -m nice -n $NICENESS_LEVEL mono --debug "$app_name" #-console=basic echo "$(mdate): $screen_name started." sleep $SNOOZE_TIME