use dirname of $0 instead of explicit ../tools

diff --git a/do_merge b/do_merge
index 01959dd0cf6017ef6ce343e512316735d6f8ad0e..63d90cc10b8a2fcad04b4401326818c3d7c44f60 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -141,7 +141,7 @@ for h in $heads; do
        esac
        [ -f "../merge-fixes/$tree" ] && {
                for p in $(cat "../merge-fixes/$tree"); do
-                       ../tools/merge_fix -n "$p" || {
+                       $(dirname $0)/merge_fix -n "$p" || {
                                bash -i || exit
                        }
                done

diff --git a/make_tree_file b/make_tree_file
index 7d2c5136989325c5d024fa3889f9c21112574fe9..fd0e6b97bc2f79eb6c88e95322e758c0b86667ab 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -53,7 +53,7 @@ git diff-tree -p "$l.." >"../$p"
 gpg2 -u 41D5C07A -a -b "../$p"
 #echo "$l" > "../LATEST-IS-$n"
 
-../tools/make_abat_scripts "$d" "$l"
+$(dirname $0)/make_abat_scripts "$d" "$l"
 
 echo Pushing to korg ...
 git push korg

diff --git a/merge_akpm b/merge_akpm
index 2a50dcb3bce0f18a67705101aa8e7c0afabb4aeb..06489d4e02c152ab34ecd1457841004254ba04c6 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -100,7 +100,7 @@ execute git merge --no-ff akpm/master || {
 
 [ -f "../merge-fixes/akpm" ] && {
        for p in $(cat "../merge-fixes/akpm"); do
-               ../tools/merge_fix -n "$p" || {
+               $(dirname $0)/merge_fix -n "$p" || {
                        bash -i || exit
                }
        done

diff --git a/merge_old_version b/merge_old_version
index 41833eaeb507230c06a88e794fa5b86bb30ad69b..d0a52f5293fd1bf4db0e198ca4a9c2bb8b30ce58 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -59,7 +59,7 @@ execute git merge "refs/next/$ver/$tree" || {
 }
 [ -f "../merge-fixes/$tree" ] && {
        for p in $(cat "../merge-fixes/$tree"); do
-               ../tools/merge_fix -n "$p" || {
+               $(dirname $0)/merge_fix -n "$p" || {
                        bash -i || exit
                }
        done