use the local do_build script

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 59f1ea9bfda131b620467cbb6faea1f2fb6dadba..21cdf118bfe8b9e90dbc0f299d05ec05a5f7549c 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -1,10 +1,12 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
+
 build_host="ka2"
 build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 
@@ -147,7 +149,7 @@ for h in $heads; do
        esac
        [ -f "../merge-fixes/$tree" ] && {
                for p in $(cat "../merge-fixes/$tree"); do
-                       $(dirname $0)/merge_fix -n "$p" || {
+                       "$bin_dir/merge_fix" -n "$p" || {
                                bash -i || exit
                        }
                done
@@ -175,7 +177,7 @@ for h in $heads; do
                echo git push failed 1>&2
                bash -i || exit
        }
-       ssh "$build_host" "$build_cmd" || {
+       "$bin_dir/do_build" || {
                echo Build failed 1>&2
                bash -i || exit
        }