X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=do_revert;h=f56960a6288c8c3eda81b732c5eca9cc911e02c9;hb=48275e0edce0dfa703fb4a8bf3abbbac70f2cb2e;hp=a66225b605a784ac896ce70a88563b5e964d26d3;hpb=4105f526175d8fd8726d8e56a2fcca7edb94d8c0;p=next-scripts

diff --git a/do_revert b/do_revert
index a66225b..f56960a 100755
--- a/do_revert
+++ b/do_revert
@@ -1,12 +1,5 @@
 #!/bin/bash
 
-bin_dir="$(dirname $0)"
-
-LOG_FILE="../merge.log"
-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
 [ "$1" = "-n" ] && {
@@ -17,17 +10,7 @@ no_build=false
 rev=$1
 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()
 {
@@ -45,7 +28,7 @@ GIT_EDITOR=: execute git revert $rev || exit 1
 
 $no_build && exit 0
 
-git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
 	echo git push failed 1>&2
 	bash -i || exit
 }