]> git.ozlabs.org Git - next-scripts/blobdiff - do_merge
use dirname of $0 instead of explicit ../tools
[next-scripts] / 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