From: Witold Kręcicki <wpk@isc.org>
Date: Tue, 19 Jun 2018 07:18:59 +0000 (+0200)
Subject: Check if gitlab exists in git-replay-merge.sh{
X-Git-Tag: v9.13.2~29^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdbe639fe621efaac9c2880b1da950ea312c75f5;p=thirdparty%2Fbind9.git

Check if gitlab exists in git-replay-merge.sh{
---

diff --git a/util/git-replay-merge.sh b/util/git-replay-merge.sh
index 81ee5c4eee8..9fa408e577a 100644
--- a/util/git-replay-merge.sh
+++ b/util/git-replay-merge.sh
@@ -31,6 +31,13 @@ die_with_usage() {
 	    "	${SELF} --abort"
 }
 
+verify_gitlab_cli() {
+	which gitlab >/dev/null 2>&1 || \
+		die "You need to have gitlab cli installed and configured: "\
+		    "" \
+		    "$ gem install --user-install gitlab"
+}
+
 die_with_continue_instructions() {
 	die ""								\
 	    "Replay interrupted.  Conflicts need to be fixed manually."	\
@@ -176,6 +183,7 @@ case "$1" in
 		cleanup
 		;;
 	"--continue")
+		verify_gitlab_cli
 		die_if_not_in_progress
 		source "${STATE_FILE}"
 		resume
@@ -184,6 +192,7 @@ case "$1" in
 		if [[ $# -ne 3 ]]; then
 			die_with_usage
 		fi
+		verify_gitlab_cli
 		die_if_in_progress
 		go "$@"
 		;;