From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Nov 2018 03:46:28 +0000 (+1100)
Subject: consolidate the notifications into a single user supplied script
X-Git-Url: https://git.ozlabs.org/?p=next-scripts;a=commitdiff_plain;h=c732fa9f6ca336e2e3e601f9b3b7c9a127a23575

consolidate the notifications into a single user supplied script
---

diff --git a/do_build b/do_build
index a90373d..c813926 100755
--- a/do_build
+++ b/do_build
@@ -85,7 +85,7 @@ $cmd <<-EOF
 			echo "\$sep"
 			echo " log \$b increased number of lines"
 			echo "\$sep"
-			pushover "linux-next: \$arch \$conf log got bigger"
+			linux-next-notify "linux-next: \$arch \$conf log got bigger"
 			if [ -f $obdir/\$b ]; then
 				diff -u $obdir/\$b \$log 2>&1 | less
 			else
diff --git a/do_merge b/do_merge
index 391fbee..eee2032 100755
--- a/do_merge
+++ b/do_merge
@@ -116,7 +116,7 @@ for h in $heads; do
 	[ -f "../pre-merge/$tree" ] && {
 		for p in $(cat "../pre-merge/$tree"); do
 			"$bin_dir/do_patch" -n "$p" || {
-				notify-send -u critical -t 0 "premerge patch failed"
+				linux-next-notify "premerge patch failed"
 				bash -i || exit
 			}
 		done
@@ -138,8 +138,7 @@ for h in $heads; do
 					"$bin_dir/do_rm" $rm_files
 			}
 			git diff 2>&1 | egrep -q '<<<<<|^\*' && {
-				notify-send -t 0 -u critical "linux-next new conflict found merging $tree!"
-				pushover "linux-next new conflict found merging $tree!"
+				linux-next-notify "new conflict found merging $tree"
 				if [ -f "../merge-fixes/$tree" ]; then
 					echo "Merge fixes exist for this tree:"
 					cat "../merge-fixes/$tree"
@@ -148,8 +147,7 @@ for h in $heads; do
 			}
 #			[ "$(git status --porcelain)" ] && {
 				GIT_EDITOR=: execute git commit -v -a || {
-					notify-send -t 0 -u critical "linux-next commit failed for $tree!"
-					pushover "linux-next commit failed for $tree!"
+					linux-next-notify "next commit failed for $tree"
 					bash -i || exit
 				}
 				execute git diff -M --stat --summary 'HEAD^..'
@@ -160,8 +158,7 @@ for h in $heads; do
 	[ -f "../merge-fixes/$tree" ] && {
 		for p in $(cat "../merge-fixes/$tree"); do
 			"$bin_dir/merge_fix" -n "$p" || {
-				notify-send -t 0 -u critical "linux-next merge fix failed for $tree!"
-				pushover "linux-next merge fix failed for $tree!"
+				linux-next-notify "merge fix failed for $tree"
 				bash -i || exit
 			}
 		done
@@ -184,27 +181,22 @@ for h in $heads; do
 		continue
 	git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
 		echo git push failed 1>&2
-		notify-send -t 0 -u critical "linux-next push failed for $tree!"
-		pushover "linux-next push failed for $tree!"
+		linux-next-notify "push failed for $tree"
 		bash -i || exit
 	}
 	[ -x "../pre-build/$tree" ] && {
 		"../pre-build/$tree" || {
 			echo Prebuild script failed 1>&2
-			notify-send -t 0 -u critical "linux-next pre-build script failed for $tree!"
-			pushover "linux-next pre-build script failed for $tree!"
+			linux-next-notify "pre-build script failed for $tree"
 			bash -i || exit
 		}
 	}
 	"$bin_dir/do_build" "$tree" || {
 		echo Build failed 1>&2
-		notify-send -t 0 -u critical "linux-next build failed for $tree!"
-		pushover "linux-next build failed for $tree!"
+		linux-next-notify "build failed for $tree"
 		bash -i || exit
 	}
 
-	notify-send -u normal "Merge and build of $tree successful"
-
 	need_build=false
 done
 
diff --git a/merge_akpm b/merge_akpm
index ca55e9f..0c3684d 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -89,8 +89,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
 	bash -i || exit
 }
 echo "fix up?"
-notify-send "Waiting for akpm fix up"
-pushover "Waiting for akpm fix up"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd