From 0516f3f439decbe4c1b280cafa6001abddd4e3ac Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@corelight.com>
Date: Mon, 27 Jan 2020 12:01:27 +0000
Subject: [PATCH] Change Bro wrapper script to now abort when old executable
 names are still used.

---
 zeek-wrapper.in | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/zeek-wrapper.in b/zeek-wrapper.in
index 1372c573e7..249df3ad53 100755
--- a/zeek-wrapper.in
+++ b/zeek-wrapper.in
@@ -1,14 +1,13 @@
 #! /usr/bin/env bash
 #
-# Wrapper to continue supporting old names of executables.
-# This will print a deprecation warning to stderr if (1) stdin/stdout/stderr
-# are all connected to a tty, and (2) the environment variable ZEEK_IS_BRO
-# is unset.
+# Wrapper to continue reporting usage old names of executables.
+# This will print an error warning to stderr if stdin/stdout/stderr
+# are all connected to a tty. In any case, it will abort with error
+# exit code.
 
 function deprecated {
 cat >&2 <<EOF
-Warning: Use of '$1' is deprecated. It is linked to a wrapper that
-         will be removed in the future. Please use '$2' instead.
+Error: Use of '$1' is no longer supported. Please use '$2' instead.
 
 EOF
 }
@@ -27,6 +26,6 @@ if [ ! -f "${base}/${new}" ]; then
     exit 1
 fi
 
-test -t 0 && test -t 1 && test -t 2 && test -z "${ZEEK_IS_BRO}" && deprecated "${old}" "${new}"
+test -t 0 && test -t 1 && test -t 2 && deprecated "${old}" "${new}"
 
-"${base}/${new}" "$@"
+exit 1