make some stuff common

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 21cdf118bfe8b9e90dbc0f299d05ec05a5f7549c..66e0b5eb7ca7f82dfcdb970808de08d956705fd2 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -1,15 +1,5 @@
 #!/bin/bash
 
-bin_dir="$(dirname $0)"
-
-LOG_FILE="../merge.log"
-SHA1_FILE="../SHA1s"
-
-build_host="ka2"
-build_dir="/scratch/sfr/next"
-[ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
-[ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
-
 no_build=false
 start_from=""
 
@@ -26,17 +16,8 @@ start_from=""
        }
        shift
 }
-[ -n "$1" ] && {
-       build_host="$1"
-       shift
-}
-[ -n "$1" ] && {
-       build_dir="$1"
-       shift
-}
 
-export NEXT_BUILD_HOST="$build_host"
-export NEXT_BUILD_DIR="$build_dir"
+. "$(dirname $0)/common.sh"
 
 log()
 {