From f39f37c90f7d4a75aaaf600480afe96f61afea0c Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Tue, 28 Mar 2017 12:39:16 +0700 Subject: [PATCH] Fix paths in run-debug scipts --- run-debug/interop | 17 +++++++++++++++-- run-debug/konanc | 15 ++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/run-debug/interop b/run-debug/interop index 9976a55fbf1..ee103a07eef 100755 --- a/run-debug/interop +++ b/run-debug/interop @@ -1,5 +1,18 @@ -#!/usr/bin/env bash +#!/usr/bin/env bash -../dist/bin/interop -Dkonan.dependencies=../dependencies/all "$@" +findScriptHome() { + local source="${BASH_SOURCE[0]}" + while [ -h "$source" ] ; do + local linked="$(readlink "$source")" + local dir="$(cd -P $(dirname "$source") && cd -P $(dirname "$linked") && pwd)" + source="$dir/$(basename "$linked")" + done + (cd -P "$(dirname "$source")" && pwd) +} +SCRIPT_HOME="$(findScriptHome)" + +PATH="$SCRIPT_HOME/../dist/bin:$PATH" + +interop -Dkonan.dependencies="$SCRIPT_HOME/../dependencies/all" "$@" diff --git a/run-debug/konanc b/run-debug/konanc index 069eaa9660f..c713109e6bb 100755 --- a/run-debug/konanc +++ b/run-debug/konanc @@ -1,3 +1,16 @@ #!/usr/bin/env bash -../dist/bin/konanc -Dkonan.dependencies=../dependencies/all "$@" \ No newline at end of file +findScriptHome() { + local source="${BASH_SOURCE[0]}" + while [ -h "$source" ] ; do + local linked="$(readlink "$source")" + local dir="$(cd -P $(dirname "$source") && cd -P $(dirname "$linked") && pwd)" + source="$dir/$(basename "$linked")" + done + (cd -P "$(dirname "$source")" && pwd) +} +SCRIPT_HOME="$(findScriptHome)" + +PATH="$SCRIPT_HOME/../dist/bin:$PATH" + +konanc -Dkonan.dependencies="$SCRIPT_HOME/../dependencies/all" "$@" \ No newline at end of file