diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2013-08-16 02:18:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2017-02-16 14:42:38 -0500 |
| commit | f302cbed525fddc4596c6d568a176a1528b88058 (patch) | |
| tree | ef183433e932c484b38d2286ad7bc5ebe7362d4c /lib/common.sh | |
| parent | 978caaf7de4b7e18d5b9a3763d479ab5a7adae24 (diff) | |
| download | devtools32-f302cbed525fddc4596c6d568a176a1528b88058.tar.xz | |
Avoid using string interpolation; use printf format strings instead.
This involves extending the signature of lib/common.sh's `stat_busy()`,
`lock()`, and `slock()`. The `mesg=$1; shift` in stat_busy even suggests
that this is what was originally intended from it.
Diffstat (limited to 'lib/common.sh')
| -rw-r--r-- | lib/common.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common.sh b/lib/common.sh index 455eb03..22a80ca 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -55,7 +55,7 @@ error() { stat_busy() { local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" >&2 + printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2 } stat_done() { @@ -141,7 +141,7 @@ get_full_version() { } ## -# usage : lock( $fd, $file, $message ) +# usage : lock( $fd, $file, $message, [ $message_arguments... ] ) ## lock() { # Only reopen the FD if it wasn't handed to us @@ -151,14 +151,14 @@ lock() { fi if ! flock -n $1; then - stat_busy "$3" + stat_busy "${@:3}" flock $1 stat_done fi } ## -# usage : slock( $fd, $file, $message ) +# usage : slock( $fd, $file, $message, [ $message_arguments... ] ) ## slock() { # Only reopen the FD if it wasn't handed to us @@ -168,7 +168,7 @@ slock() { fi if ! flock -sn $1; then - stat_busy "$3" + stat_busy "${@:3}" flock -s $1 stat_done fi |