diff options
| author | Bernd Jendrissek <bernd.jendrissek@gmail.com> | 2012-06-21 01:04:28 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-06-21 11:42:23 +0200 |
| commit | c6599399ec36c941bbd2c504f1aebf2b45816ace (patch) | |
| tree | b31738990803d48b85a61f31917fdf82d573d740 /gnulib-tool | |
| parent | adff17f337187985ea8c62b961fde5c9544911aa (diff) | |
| download | gnulib-c6599399ec36c941bbd2c504f1aebf2b45816ace.tar.gz | |
Do use readlink if available
The main effect of this patch is to make gnulib-tool not spam the
terminal with failures from ls. Despite the copious stderr output,
files still get linked correctly.
gnulib-tool: Use readlink if it is available.
* gnulib-tool (func_readlink): Choose function more appropriately.
Running under dash, type -p readlink fails because dash doesn't
understand -p. That causes gnulib-tool to fall back to ls to read
symlinks, despite readlink being available. That, in turn, spams the
terminal when func_ln_if_changed's DEST argument doesn't exist.
The output from type goes to /dev/null anyway, so asking for -p has no
purpose.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnulib-tool b/gnulib-tool index 16f9b2f7f3..6213f50e81 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -591,7 +591,7 @@ func_warning () # func_readlink SYMLINK # outputs the target of the given symlink. -if (type -p readlink) > /dev/null 2>&1; then +if (type readlink) > /dev/null 2>&1; then func_readlink () { # Use the readlink program from GNU coreutils. |