From 37b4bbb432ec1f334ba193918904195e5406e830 Mon Sep 17 00:00:00 2001 From: Yakov Markovitch Date: Mon, 15 Feb 2021 22:31:26 +0300 Subject: [PATCH] src: simplify symbolic link resolution in Linux Sourcetrail launch script (#1134) Co-authored-by: Yakov Markovitch --- setup/Linux/data/package/Sourcetrail.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/setup/Linux/data/package/Sourcetrail.sh b/setup/Linux/data/package/Sourcetrail.sh index bb4b9abc..09414b48 100755 --- a/setup/Linux/data/package/Sourcetrail.sh +++ b/setup/Linux/data/package/Sourcetrail.sh @@ -1,16 +1,7 @@ #!/bin/sh -# get the current directory -SOURCE="${0}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - case $SOURCE in # if $SOURCE is a relative symlink, we need to resolve it relative to the path where the symlink file was located - /*) ;; - *) SOURCE="$DIR/$SOURCE" ;; - esac -done -SOURCETRAIL_PATH="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +# Get the current directory in canonical form (resolve all the symlinks, if present) +SOURCETRAIL_PATH="$(dirname "$(readlink -f "$0")")" export LD_LIBRARY_PATH="$SOURCETRAIL_PATH/lib:$LD_LIBRARY_PATH" export QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb:$QT_XKB_CONFIG_ROOT"