From a87d1fd8758f3e3d9e6c78b2f165311dfac82ae0 Mon Sep 17 00:00:00 2001
From: Daniel Thayer <dnthayer2@gmail.com>
Date: Sat, 11 May 2019 19:05:25 -0500
Subject: [PATCH] Fix zeek-wrapper

The script was not passing command-line arguments to the new program.

Also improved some error messages.
---
 zeek-wrapper.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/zeek-wrapper.in b/zeek-wrapper.in
index 91c08b5a5a..1372c573e7 100755
--- a/zeek-wrapper.in
+++ b/zeek-wrapper.in
@@ -17,11 +17,16 @@ base=$(dirname $0)
 old=$(basename $0)
 new=$(echo "${old}" | sed 's/^bro/zeek/')
 
-if [ ! -x "${base}/${new}" ]; then
+if [ "${new}" = "${old}" ]; then
+    echo "zeek-wrapper: this script is just a wrapper for old commands"
+    exit 1
+fi
+
+if [ ! -f "${base}/${new}" ]; then
     echo "zeek-wrapper: ${new} not found"
     exit 1
 fi
 
 test -t 0 && test -t 1 && test -t 2 && test -z "${ZEEK_IS_BRO}" && deprecated "${old}" "${new}"
 
-test "${new}" != "${old}" && "${base}/${new}"
+"${base}/${new}" "$@"