use the local do_build script

[next-scripts] / merge_fix

diff --git a/merge_fix b/merge_fix
index 0bb4ed3939090173e9f67b767670d5e740d11c26..27db62fd6e079806b68a04ce83b58c3cf24fca2f 100755 (executable)
--- a/merge_fix
+++ b/merge_fix
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+bin_dir="$(dirname $0)"
+
 LOG_FILE="../merge.log"
 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"
 
@@ -77,8 +78,7 @@ git push -f "$build_host":"$build_dir" master:refs/heads/next || {
        bash -i || exit
 }
 
-echo "Building using $build_cmd on $build_host"
-ssh "$build_host" "$build_cmd" || {
+"$bin_dir/do_build" || {
        echo Build failed 1>&2
        bash -i || exit
 }