From 422aa56243c8c65d1414afa08e5ce2cade79ad2d Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sun, 31 Jan 2021 10:11:23 +0100 Subject: rockboxdev: fix issues with relative paths for commandline options I wanted to build into a 'toolchain' directory like this: $ tools/rockboxdev.sh --dlwhere=toolchain --builddir=toolchain/build --prefix=toolchain/bin This failed twice: a) the extraction stage could not uncompress because of the relative paths, so convert them to absolute paths in the script to fix the issue. b) patches could not be applied because 'rockboxdevdir' was assigned a string with the directory twice and '\n' in the middle. Using readlink, this now works. Change-Id: I9c7c30812e1fb4b58db7e6561d73678f34714c91 --- tools/rockboxdev.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools/rockboxdev.sh') diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index d9b5ecd524..ac21a4c524 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh @@ -30,7 +30,7 @@ else fi # This is the absolute path to where the script resides. -rockboxdevdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +rockboxdevdir="$( readlink -f "$( dirname "${BASH_SOURCE[0]}" )" )" if [ `uname -s` = "Darwin" ]; then parallel=`sysctl -n hw.physicalcpu` @@ -707,6 +707,10 @@ if [ -n "$missingtools" ]; then exit 1 fi +dlwhere=$(readlink -f "$dlwhere") +prefix=$(readlink -f "$prefix") +builddir=$(readlink -f "$builddir") + echo "Download directory : $dlwhere (set RBDEV_DOWNLOAD or use --dlwhere= to change)" echo "Install prefix : $prefix (set RBDEV_PREFIX or use --prefix= to change)" echo "Build dir : $builddir (set RBDEV_BUILD or use --builddir= to change)" -- cgit v1.2.3