From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 1 Oct 2020 01:47:22 +0000 (+1000)
Subject: merge_msg: set and use tools_dir
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=aded3d9f8e83f652dddd6b5a1b0ffa206ccabfb1;p=next-scripts

merge_msg: set and use tools_dir

There will be more uses soon
---

diff --git a/merge_msg b/merge_msg
index 847698b..7ab7c17 100755
--- a/merge_msg
+++ b/merge_msg
@@ -8,6 +8,8 @@ fi
 
 gitk --merge -- "$@" &
 
+tools_dir=$(dirname "$0")
+
 printf -v files '  %s\n' "$@"
 conf='a conflict'
 if [ "$#" -gt 1 ]; then
@@ -16,7 +18,7 @@ fi
 
 subject='manual merge of the BRANCH tree with the FIXME tree'
 
-"$(dirname "$0")/message_helper" "${branch[@]}" "$subject" <<EOF
+"$tools_dir/message_helper" "${branch[@]}" "$subject" <<EOF
 FIXME: Add owner of second tree to To:
        Add author(s)/SOB of conflicting commits.