From dceb10d96f25338e8edff20e1542b8ac9df43ef8 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 19 Nov 2018 04:34:51 +1100 Subject: [PATCH] canonicalise some file/dir names introduce $top_dir --- common.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common.sh b/common.sh index 5e27d5f..9f18277 100644 --- a/common.sh +++ b/common.sh @@ -6,11 +6,12 @@ [ "$_next_common_included" ] && return 0 _next_common_included=1 -bin_dir=$(dirname "$0") +bin_dir=$(realpath $(dirname "$0")) +top_dir=$(dirname "$bin_dir") -[ "$LOG_FILE" ] || LOG_FILE="../merge.log" -SHA1_FILE="../SHA1s" -CTRL_FILE="../etc/control" +[ "$LOG_FILE" ] || LOG_FILE="$top_dir/merge.log" +SHA1_FILE="$top_dir/SHA1s" +CTRL_FILE="$top_dir/etc/control" build_host="ash" build_dir="/home/sfr/next/next" -- 2.39.5