Project

General

Profile

Statistics
| Revision:

# Date Author Comment
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.

9062 05/10/2013 10:51 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added require_exists (), used to skip make commands for existing files

9061 05/10/2013 10:33 AM Aaron Marcuse-Kubitza

*{.sh,run}: use `test !` instead of `! test` so that the ! is right next to the operator it's negating

9060 05/10/2013 10:31 AM Aaron Marcuse-Kubitza

/run: geoscrub_input/make (): use new check_fake_target_exists to create the file only if it doesn't exist yet

9059 05/10/2013 10:31 AM Aaron Marcuse-Kubitza

lib/sh/make.sh: added check_fake_target_exists (analogous to check_target_exists), which defers the target existence check until to_file (when the target name will presumably have been resolved to a path)

9058 05/10/2013 10:29 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: to_file (): support only running if the file does not exist by setting $if_not_exists

9057 05/10/2013 10:08 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: limit_stderr_cmd (): run cmd2rel_path explicitly here because echo_run is split apart rather than being run as echo_run ()

9056 05/10/2013 10:06 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved echo_cmd, echo_run before commands that use them

9055 05/10/2013 10:02 AM Aaron Marcuse-Kubitza

lib/sh/make.sh: check_target_exists: if remaking, consider target not to exist

9054 05/10/2013 10:01 AM Aaron Marcuse-Kubitza

lib/sh/make.sh: added remaking alias

9053 05/10/2013 09:45 AM Aaron Marcuse-Kubitza

inputs/GBIF/table.run: table.tsv/make (): use echo_run instead of extern so that the command name is canonicalized properly

9052 05/10/2013 09:45 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_run (): use new cmd2rel_path to resolve the command ($1)

9051 05/10/2013 09:44 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added cmd2rel_path alias, which makes $1 a canon_rel_path if it's a filesystem path. this removes extra .. in the paths of invoked commands.

9050 05/10/2013 09:06 AM Aaron Marcuse-Kubitza

*{.sh,run}: use shorter `test` instead of `test -n` and `test !` instead of `test -z` (http://www.gnu.org/software/bash/manual/bash.html#Bourne-Shell-Builtins > test)

9049 05/10/2013 08:52 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: echo_cmd (): don't include leading extern because it clutters up the output and is implied by the log_level

9048 05/10/2013 08:45 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: to_file (): run echo_func and `echo_vars stdout` to show what file the output is going to, since this information (i.e. redirects) isn't included in the logging output for the command itself

9047 05/10/2013 08:41 AM Aaron Marcuse-Kubitza

lib/runscripts/table.run: remake_VegBIEN_mappings (): added public_schema_exists check, ported from lib/import.sh

9046 05/10/2013 08:40 AM Aaron Marcuse-Kubitza

lib/sh/local.sh: added public_schema_exists (), ported from lib/import.sh

9045 05/10/2013 08:32 AM Aaron Marcuse-Kubitza

*{.sh,run}: use new echo_stdout instead of echo_stdin where applicable, for clarity

9044 05/10/2013 08:31 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added echo_stdout (currently just an alias of echo_stdin, because they are usable for the same purpose)

9043 05/10/2013 08:27 AM Aaron Marcuse-Kubitza

/run: moved geoscrub_input export into separate geoscrub_input/make () target

9042 05/10/2013 08:24 AM Aaron Marcuse-Kubitza

lib/sh/db.sh: pg_export_table_to_dir_no_header (): use to_file so that the file is autoremoved in case of error

9041 05/10/2013 07:51 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: let (): renamed to let! so that let can still be used to evaluate whether a numeric value is 0 (yes, an ! is allowed at the end of a command name)

9040 05/10/2013 07:44 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved canon_rel_path () into separate paths section

9039 05/10/2013 07:39 AM Aaron Marcuse-Kubitza

bugfix: : use new func_override for runscript inheritance instead of invoking the overridden function as a (command-line) target of the parent runscript. this ensures that the overridden function is run in the *same process as the calling function, so that $top_dir keeps the same value and runscript-relative paths continue to work.

9038 05/10/2013 07:30 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added func_override (), for use in runscript inheritance

9037 05/10/2013 07:03 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: copy_func (): check that $from exists and $to does not exist (i.e. don't clobber existing functions). you can always first `unset -f` the function to get around the no-clobber restriction.

9036 05/10/2013 07:00 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: exceptions: added die ()

9035 05/10/2013 06:44 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: log_e (): restructured as an error handler to put after save_e rather than as a wrapper around the entire command. this allows it to be used with any kind of expression (such as boolean expressions with !), not just single commands.

9034 05/10/2013 06:35 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: log_e (): don't export $e to the calling context, since the caller can just use ` || { save_e; ...; }` if they need $e

9033 05/10/2013 06:31 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: calls to log_e: don't rely on log_e setting $e

9032 05/10/2013 06:30 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added save_e, which now sets $e just locally

9031 05/10/2013 06:28 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: save_e: renamed to export_e because $e overwrites any previous value in the calling context

9030 05/10/2013 06:26 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: removed no longer used save_e_cmd

9029 05/10/2013 06:24 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: try (): use simpler save_e instead of save_e_cmd

9028 05/10/2013 06:19 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: bool2int (): need to use try instead of save_e_cmd because save_e_cmd rethrows the error, which should instead just be stored in $e. this bug was not found in testing because bool2int was only used in $(), which errexit does not apply to.

9027 05/10/2013 06:15 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: exceptions: added save_e, now an alias for e=$?. added save_e/rethrow usage.

9026 05/10/2013 06:11 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: renamed save_e () to save_e_cmd () since it actually runs a command, in addition to saving $?

9025 05/10/2013 06:08 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: log_e (): rewrote to avoid using save_e, which will be repurposed

9024 05/10/2013 05:50 AM Aaron Marcuse-Kubitza

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

9023 05/10/2013 05:50 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: moved copy_func () after exceptions so it can use save_e/rethrow

9022 05/10/2013 05:44 AM Aaron Marcuse-Kubitza

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

9021 05/10/2013 05:39 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: save_e (): usage: added rethrow example

9020 05/10/2013 05:26 AM Aaron Marcuse-Kubitza

bugfix: lib/sh/util.sh: bool2int (): need to load new aliases before it so that save_e will be expanded

9019 05/10/2013 05:24 AM Aaron Marcuse-Kubitza

*{.sh,run}: put functions on one line where possible (and where they are not expected to expand)

9018 05/10/2013 05:19 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: added separate include guard around the include guard utils so they don't have to be redefined on every include of util.sh

9017 05/10/2013 05:06 AM Aaron Marcuse-Kubitza

*{.sh,run}: added extra line before new sections to visually separate them. lib/sh/util.sh: added missing section headers.

9016 05/10/2013 05:01 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: split make utils out into separate make.sh

9015 05/10/2013 04:38 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: split archive (zip) utils out into separate archives.sh

9014 05/10/2013 04:24 AM Aaron Marcuse-Kubitza

lib/sh/util.sh: split databases utils out into separate db.sh

9013 05/10/2013 04:05 AM Aaron Marcuse-Kubitza

moved lib/*.sh to sh/ subdir so it's easier to find the .sh files among all the other lib/ files

9012 05/10/2013 03:32 AM Aaron Marcuse-Kubitza

lib/util.sh: removed no longer used limit_stderr_extern. use `limit_stderr_cmd extern` instead.

9011 05/10/2013 03:29 AM Aaron Marcuse-Kubitza

lib/util.sh: specify limit_stderr_cmd just for the (few) commands that need it, rather than for all commands, so that commands that use stderr to print important error messages don't have those error messages hidden when the verbosity is too low. (error messages should always be displayed, regardless of the verbosity.)

9010 05/10/2013 03:13 AM Aaron Marcuse-Kubitza

lib/util.sh: limit_stderr_cmd (): only echo the command if it starts with echo_run. this requires adding echo_run before commands that use limit_stderr_cmd, such as limit_stderr_extern.

9009 05/10/2013 03:07 AM Aaron Marcuse-Kubitza

lib/util.sh: limit_stderr_cmd (): remove echo_run from the command to run so that the command name isn't echoed twice

9008 05/10/2013 02:56 AM Aaron Marcuse-Kubitza

lib/util.sh: limit_stderr_cmd: alias-expand command after it

9007 05/10/2013 02:53 AM Aaron Marcuse-Kubitza

lib/util.sh: $verbosity: ensure it's an integer using `declare -i`

9006 05/10/2013 02:45 AM Aaron Marcuse-Kubitza

lib/util.sh: grouped set verbosity statements together and commented them

9005 05/10/2013 02:43 AM Aaron Marcuse-Kubitza

bugfix: lib/util.sh: verbose output: $verbosity defaults to $verbose (boolean) converted to integer. the previous set-default of $verbosity to $verbose has been removed because it came after `: "${verbosity=3}"` and thus didn't have an effect.

9004 05/10/2013 02:40 AM Aaron Marcuse-Kubitza

lib/util.sh: added bool2int ()

9003 05/10/2013 02:32 AM Aaron Marcuse-Kubitza

*{.sh,run}: use new isset

9002 05/10/2013 02:31 AM Aaron Marcuse-Kubitza

lib/util.sh: added isset ()

9001 05/10/2013 02:28 AM Aaron Marcuse-Kubitza

*{.sh,run}: use ${var+isset} instead of ${var+t} for clarity

9000 05/10/2013 02:22 AM Aaron Marcuse-Kubitza

lib/util.sh: propagate the verbosity to invoked commands by exporting it

8999 05/10/2013 02:20 AM Aaron Marcuse-Kubitza

lib/util.sh: run all commands verbosely by default, not just runscripts. this ensures verbose output for invoked commands like inputs/GBIF/MySQL_export.

8998 05/10/2013 02:15 AM Aaron Marcuse-Kubitza

lib/util.sh: echo_stdin (): use new pipe_delay

8997 05/10/2013 02:12 AM Aaron Marcuse-Kubitza

lib/util.sh: added pipe_delay (used as `cmd1 | { pipe_delay; cmd2; }`)

8996 05/10/2013 02:06 AM Aaron Marcuse-Kubitza

lib/util.sh: limit_stderr_cmd (): echo the command like echo_run so that callers don't have to separately call echo_run. this reduces clutter of the nested aliases, ensures that the command is always echoed outside of the inner stderr-limiter (which has a different log_level), and avoids echoing "limit_stderr_cmd" itself as part of the command name.

8995 05/10/2013 01:47 AM Aaron Marcuse-Kubitza

lib/util.sh: limit_stderr (): increase the log_level so that stderr of verbose commands can be turned off separately from the names of the commands themselves. it will now usually have log_level 2, indicating output that is useful primarily for debugging (this is the same as for shell function calls).

8994 05/10/2013 01:39 AM Aaron Marcuse-Kubitza

lib/util.sh: renamed log_stderr* to limit_stderr* to reflect that stderr is limited (i.e. controlled) rather than logged