From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olivier Matz Subject: [PATCH] scripts: fix relpath.sh output when build dir is a symlink Date: Tue, 5 May 2015 11:00:09 +0200 Message-ID: <1430816409-6773-1-git-send-email-olivier.matz@6wind.com> References: <55476C37.8050702@netinsight.net> To: dev-VfR2kkLFssw@public.gmane.org Return-path: In-Reply-To: <55476C37.8050702-vI6UBbBVNY+JA8cjQkG2/g@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" The script relpath.sh return the relative path of the first directory from the second directory. It is used to generate relative symlinks, which can be useful if the build directory is embedded in the dpdk directory: the whole dpdk can be moved without breaking the links, which is helpful for an installation. In case the build directory is a symlink, the script was not generating the proper relative path. Fix this by calling "readlink -f" on the arguments. Signed-off-by: Olivier Matz --- scripts/relpath.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/relpath.sh b/scripts/relpath.sh index 00030e5..7d2f48f 100755 --- a/scripts/relpath.sh +++ b/scripts/relpath.sh @@ -43,8 +43,13 @@ if [ $# -ne 2 ]; then exit 1 fi -REL1=${1#/} -REL2=${2#/} +# get the real absolute path, derefencing symlinks +ABS1=$(readlink -f $1) +ABS2=$(readlink -f $2) + +# remove leading slash +REL1=${ABS1#/} +REL2=${ABS2#/} left1=${REL1%%/*} right1=${REL1#*/} -- 2.1.4