forked from qt-creator/qt-creator
don't detect readlink a-priori
it's pointless and causes an unnecessary delay. what's worse, we wouldn't actually know whether we found a compatible (gnu) readlink, so the fallback would never get activated. this would be the case on macos (the problem wasn't noticed so far, because on macos we build a bundle which doesn't need the wrapper in the first place). Change-Id: Ibf4c370d5d9e25064e80faeaf12eb5fa1bc68c20 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -19,13 +19,12 @@ makeAbsolute() {
|
||||
|
||||
me=`which "$0"` # Search $PATH if necessary
|
||||
if test -L "$me"; then
|
||||
# Try readlink(1)
|
||||
readlink=`type readlink 2>/dev/null` || readlink=
|
||||
if test -n "$readlink"; then
|
||||
# We have readlink(1), so we can use it. Assuming GNU readlink (for -f).
|
||||
me=`readlink -nf "$me"`
|
||||
# Try GNU readlink(1)
|
||||
nme=`readlink -nf "$me" 2>/dev/null`
|
||||
if test -n "$nme"; then
|
||||
me=$nme
|
||||
else
|
||||
# No readlink(1), so let's try ls -l
|
||||
# No GNU readlink(1), so let's try ls -l
|
||||
base=`dirname "$me"`
|
||||
me=`ls -l "$me" | sed 's/^.*-> //'`
|
||||
me=`makeAbsolute "$me" "$base"`
|
||||
|
Reference in New Issue
Block a user