Project

General

Profile

Statistics
| Revision:

# Date Author Comment
9162 05/11/2013 12:32 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_cmd(): don't remove -- after command, because it is added by the command() function instead and does not appear in the command sent to echo_run()

9161 05/11/2013 12:29 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: command alias: don't alias-expand next word, because the next word should only be interpreted as a command (part of the effect of the `command` builtin)

9160 05/11/2013 12:27 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: external commands: always use command rather than echo_run to indicate that a command is external, because command() ensures that what it invokes is not a shell function, and sets 2>&22 where needed

9159 05/11/2013 12:23 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: .(): use echo_run so that included files are echoed as they are included. note that echo_run uses cmd_indent, so the included files' load-time logging output will be indented according to the nesting level of the include.

9158 05/11/2013 12:20 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved .() command echoing > internal commands section

9157 05/11/2013 12:19 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved echo_run() to general command echoing section because it can also be used for internal commands

9156 05/11/2013 12:09 PM Aaron Marcuse-Kubitza

removed no longer used inputs/GBIF/MySQL_export. use lib/sh/local.sh mysql_export_local() instead.

9155 05/11/2013 12:07 PM Aaron Marcuse-Kubitza

inputs/GBIF/raw_occurrence_record/run: override table.tsv/make() instead of export_mysql()

9154 05/11/2013 12:06 PM Aaron Marcuse-Kubitza

inputs/GBIF/table.run: table.tsv/make(): use new mysql_export_local instead of ./MySQL_export

9153 05/11/2013 12:05 PM Aaron Marcuse-Kubitza

lib/sh/local.sh: added mysql_export_local()

9152 05/11/2013 12:05 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: added mysql_export(). documented that mysql_export_outfile() supports CSV, but requires the FILE privilege.

9151 05/11/2013 12:02 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql(): use --column-names to ensure the output is formatted appropriately. note that --column-names is the default, but better to specify it to be sure.

9150 05/11/2013 12:01 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql(): output_data mode: use --batch to ensure the output is formatted appropriately. note that --batch is the default when stdin is from a pipe, but better to specify it to be sure.

9149 05/11/2013 11:49 AM Aaron Marcuse-Kubitza

*{.sh,run}: use new limit_stdout_cmd instead of `stdout2stderr=1 limit_stderr_cmd`

9148 05/11/2013 11:40 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added limit_stdout_cmd alias

9147 05/11/2013 07:25 AM Aaron Marcuse-Kubitza

lib/sh/make.sh: added $rm short var for $remake

9146 05/11/2013 07:22 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: verbosity: removed `declare -i verbosity` because this does not actually ensure that $verbosity is an integer; it only has "arithmetic evaluation [...] done when the variable is assigned to" (`help declare`)

9145 05/11/2013 07:20 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: verbosity: support setting this in alternate short-name var $vb

9144 05/11/2013 07:15 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: override the `.` builtin (a.k.a. `source`) and run canon_rel_path on the included script. this removes .. in the path when it's displayed in bash error messages.

9143 05/11/2013 06:58 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: log_err(): ensure errors are visible by using 2>&22. since this is uses log(), verbosity=1 also needs to be set.

9142 05/11/2013 06:50 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: $explicit_errors_only: explicitly set verbosity=0 to hide startup logging

9141 05/11/2013 06:46 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: limit_stderr(): if stdout goes to stderr (i.e. is logging info), assume that stderr_is_errors

9140 05/11/2013 06:41 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: $explicit_errors_only: documented that this option should only be used for testing the explicit error displaying, as otherwise, important output may be missed

9139 05/11/2013 06:39 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: $explicit_errors_only: added usage

9138 05/11/2013 06:38 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: command(): updated $errors_only var name to $explicit_errors_only

9137 05/11/2013 06:27 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: $explicit_errors_only: noted that verbosity=0 displays everything that isn't explicitly hidden

9136 05/11/2013 06:24 AM Aaron Marcuse-Kubitza

lib/sh/local.sh: psql(): use new stderr_is_errors=1 since psql's logging output comes on stdout, so stderr contains only errors. (the caveat of this is that the query output is normally mixed with logging info on stdout, and needs to be separated out to a different file descriptor using --output.)

9135 05/11/2013 06:18 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added $explicit_errors_only env var which shows only explicitly-displayed errors (those which have been redirected to fd 22). note that most of the time, this has the same effect as `verbosity=0 script...`.

9134 05/11/2013 06:17 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: command(): support ensuring errors are visible by redirecting them to fd 22 (global stderr) when $stderr_is_errors is set

9133 05/11/2013 05:51 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: `command`: always prepend -- to the args list (to ensure that the command name is not interpreted as a `command` option), not just when the command alias is used

9132 05/11/2013 05:40 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: set_global_fds(): increase the log_level so the shadow_fd()/set_fd() function names aren't output at the default verbosity (3), and the redirection commands themselves aren't output at verbosity <= 2. set_global_fds() happens at the beginning of every script that uses util.sh, and is fairly predictable, so it isn't necessary to always echo these commands.

9131 05/11/2013 05:29 AM Aaron Marcuse-Kubitza

lib/sh/local.sh: psql(): use new convention for command-specific alternate stdout

9130 05/11/2013 05:15 AM Aaron Marcuse-Kubitza

lib/sh/make.sh: inline_make: use new convention for command-specific alternate stdin

9129 05/11/2013 05:13 AM Aaron Marcuse-Kubitza

*{.sh,run}: removed extra space between function name and ()

9128 05/11/2013 05:12 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: streams: moved setting of global stdin/stdout/stderr into set_global_fds () function

9127 05/11/2013 05:05 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: streams: allow commands to access global stdin/stdout/stderr using fd 20/21/22. this works even when /dev/tty isn't available.

9126 05/11/2013 05:05 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: streams: added convention that fd 10/11/12 should be used for command-specific alternate stdin/stdout/stderr

9125 05/11/2013 05:04 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added streams functions fd_exists, set_fd, shadow_fd, and helpers

9124 05/11/2013 05:01 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added echo_minor_func alias

9123 05/11/2013 05:00 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added echo_eval()

9122 05/11/2013 04:32 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: renamed require_exists() to require_not_exists() because the command actually checks if the file doesn't exist

9121 05/11/2013 02:26 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_vars(): use log() instead of manually echoing the log indent, so that the log indent string ($log_indent$PS4) doesn't have to be maintained in several different places

9120 05/11/2013 02:23 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: logging: visually separate the log_level-based indenting from the external command indenting by using the standard `set -x` prefix (1st char of PS4) for log_level indenting and $log_level_indent (i.e. whitespace) for external command indenting

9119 05/11/2013 02:19 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: logging: separate the log_level-based indenting from the external command indenting so that the log_level-based indenting can use a different prefix. this involves propagating a new var, $log_indent, to invoked commands instead of $PS4, and always prepending $log_indent to $PS4 when printing log messages.

9118 05/11/2013 01:55 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: propagate $log_level_indent to invoked commands

9117 05/11/2013 01:54 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: renamed $log_indent to $log_level_indent to indicate that this is the string added at each level, rather than the entire indent

9116 05/11/2013 01:49 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: limit_stderr(): switched back to running inc_log_level inside limit_stderr(), because it should only apply during the function for use by can_log. documented why inc_log_level needs to be inside limit_stderr().

9115 05/11/2013 01:44 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: limit_stderr(): stdout2stderr mode: only limit stdout, since stderr may contain error messages (which should always be displayed)

9114 05/11/2013 01:32 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: limit_stderr_cmd(): need to load new aliases before it so limit_stderr is expanded

9113 05/11/2013 01:31 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: limit_stderr alias: need to inc_log_level before rather than after limit_stderr(), so that can_log uses the right verbosity (previously, inc_log_level was part of limit_stderr() itself, but was moved to the alias because its effects were needed outside the function)

9112 05/11/2013 01:25 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: stdout2stderr(): fixed doc comment after space-before-() search-and-replace

9111 05/11/2013 01:24 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: usage(): use `return` instead of `(exit ...)`

9110 05/11/2013 01:23 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: verbose output: put commands into subsections

9109 05/11/2013 01:10 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_run(): factored prep code out into echo_run_prep alias, which can also be used in commands that mimic it, such as limit_stderr_cmd()

9108 05/11/2013 01:06 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: limit_stderr(): moved indent to echo_run prep, because it only applies to commands invoked with echo_run

9107 05/11/2013 01:00 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: limit_stderr(): need to apply inc_log_level in the caller so it won't get rolled back at the end of the function

9106 05/11/2013 12:51 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql_export_outfile(): ensure newline between format info ($mysql_load_data_format) and rest of SELECT query

9105 05/11/2013 12:49 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql_export_outfile(): ensure newline between SELECT columns list and INTO OUTFILE

9104 05/11/2013 12:44 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: limit_stderr_cmd(): moved stdout2stderr code to limit_stderr() because it is not specific to running limit_stderr on single commands

9103 05/11/2013 12:33 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: limit_stderr(): fixed doc comment after space-before-() search-and-replace

9102 05/11/2013 12:29 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: added mysql_export_outfile(), which uses SELECT ... INTO OUTFILE

9101 05/11/2013 12:22 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql(): added $output_data option that turns off --verbose and uses echo_stdin instead so that queries are not echoed to stdout along with data. in --verbose mode, use limit_stderr_cmd with stdout2stderr=1 to redirect echoed queries through the logging mechanism.

9100 05/11/2013 12:17 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql_cmd(): removed set_database because this is now performed by each caller before they use $database

9099 05/11/2013 12:15 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql_cmd: get command name by adding $FUNCNAME in an alias instead of using ${FUNCNAME1} in the function, so that callers can also call mysql_cmd via a nested function, etc.

9098 05/11/2013 12:00 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added ensure_nested_func()

9097 05/10/2013 11:59 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: added contains()

9096 05/10/2013 11:57 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: command alias: also prepend -- to args to prevent a first arg starting with -- from being interpreted as an option to the `command` builtin

9095 05/10/2013 10:16 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysql_cmd(): moved setting of database to specific callers (mysql(), mysqldump()) because the syntax to set it differs between mysql* commands (e.g. mysql uses `--database=` while mysqldump uses `--databases ... --tables`)

9094 05/10/2013 10:13 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: added set_database alias, and use it in mysql_cmd()

9093 05/10/2013 10:11 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: import_vars alias and applicable aliases that use it: documented that when used inside another alias 2+ levels deep, it must be run inside a function. this is due to a strange bug in bash where $() expressions in 2-level aliases produce a syntax error when the alias is expanded outside a function.

9092 05/10/2013 10:07 PM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: added back missing echo_func alias, which is needed to also include "$@" in the echoed function call

9091 05/10/2013 10:05 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: import_vars alias: use new get_prefix_vars()

9090 05/10/2013 10:04 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: add get_prefix_vars()

9089 05/10/2013 10:03 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: import_vars alias: use declare instead of local so it can be used outside a function

9088 05/10/2013 02:47 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: added mk_select alias and use it in pg_export()

9087 05/10/2013 02:36 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: pg_export(): always include the LIMIT value if specified, rather than only if the caller did not provide a full query

9086 05/10/2013 02:27 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: pg_export(): rtrim $query

9085 05/10/2013 02:22 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: added rtrim()

9084 05/10/2013 01:55 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: pg_export(): for simplicity, always use a SELECT statement as the source. take any source query in \$query without () instead of \$source with (). this will also help make pg_export uniform with MySQL.

9083 05/10/2013 01:34 PM Aaron Marcuse-Kubitza

lib/sh/db.sh: renamed pg_copy_to() to pg_export() because it is also a general-purpose export command, which could have an analogous counterpart for MySQL

9082 05/10/2013 01:23 PM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: moved self alias to beginning, before functions that use it

9081 05/10/2013 12:55 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: added repeat()

9080 05/10/2013 12:47 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: reverse(): use `i > 0` rather than `i >= 1` to match the `i < length` idiom used in forwards loops

9079 05/10/2013 12:43 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved strings section before verbose output so its commands can be used by the logging functions

9078 05/10/2013 12:32 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_run() and derivatives (limit_stderr_cmd()): use new `indent` before the invoked command so its own logging messages, if any, are indented

9077 05/10/2013 12:27 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: propagate indent to invoked commands by exporting PS4

9076 05/10/2013 12:24 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: verbose output: added indent/outdent aliases and use them in inc_log_level/dec_log_level

9075 05/10/2013 12:14 PM Aaron Marcuse-Kubitza

*{.sh,run}: replaced extern with command, a shell builtin that does the same thing. this is also part of dash (the Bourne shell on Linux).

9074 05/10/2013 12:08 PM Aaron Marcuse-Kubitza

*{.sh,run}: removed extra space between function name and (), which is apparently not needed even though `help function` includes it. this greatly improves readability, including when function names are pasted into commit messages!

9073 05/10/2013 12:03 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: require_exists (): use die/log_info's new support for info messages using $type

9072 05/10/2013 12:00 PM Aaron Marcuse-Kubitza

lib/sh/util.sh: die (): allow caller to specify a custom log message type (i.e. a suffix for log_* ())

9071 05/10/2013 11:58 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: log_e (): use new log_err

9070 05/10/2013 11:57 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: verbose output: added log_custom (), which modifies the symbol in PS4 to indicate the message type, and log_err ()/log_info (), which set specific symbols

9069 05/10/2013 11:55 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved die () into verbose output so it can use logging functions

9068 05/10/2013 11:53 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved functions after verbose output so copy_func () can use logging functions in its input checks

9067 05/10/2013 11:41 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved log_e () to verbose output section so it can use logging functions

9066 05/10/2013 11:29 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: mysqldump_diffable (): use pipe_delay to ensure that sed is printed after mysqldump

9065 05/10/2013 11:23 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_cmd (): use new log ()

9064 05/10/2013 11:21 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added log ()

9063 05/10/2013 10:53 AM Aaron Marcuse-Kubitza

lib/sh/util.sh to_file, make.sh check_target_exists: use new require_exists to print message if file skipped because it already exists. this is useful for troubleshooting why certain make commands don't run.