From f56ffd2389455cffb5fe5b1af2a3a18754f1140c Mon Sep 17 00:00:00 2001
From: Phil Rzewski <phil@brimdata.io>
Date: Thu, 28 Dec 2023 18:22:05 -0800
Subject: [PATCH] Put zeek source in zeek-src directory

---
 .github/workflows/release.yml | 8 ++++----
 release.sh                    | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index db1f49d..c5e9bbf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,7 +43,7 @@ jobs:
         ref: ${{ inputs.zeek_ref }}
         fetch-depth: 1
         submodules: recursive
-        path: zeek
+        path: zeek-src
 
     - name: Build zeekrunner (Windows)
       if: startsWith(matrix.platform, 'windows-')
@@ -70,8 +70,8 @@ jobs:
         choco install -y --no-progress winflexbison3
         call refreshenv
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
-        mkdir zeek\build
-        cd zeek\build
+        mkdir zeek-src\build
+        cd zeek-src\build
         cmake.exe .. -DCMAKE_BUILD_TYPE=release -DENABLE_ZEEK_UNIT_TESTS=yes -D CMAKE_INSTALL_PREFIX=/usr/local/zeek -DLibMMDB_INCLUDE_DIR="C:\Program Files (x86)\maxminddb\include" -DLibMMDB_LIBRARY="C:\Program Files (x86)\maxminddb\lib\maxminddb.lib" -G Ninja
         cmake.exe --build .
         cmake.exe --install .
@@ -93,7 +93,7 @@ jobs:
     - name: Build Zeek (Linux/macOS)
       if: "!startsWith(matrix.platform, 'windows-')"
       run: |
-        cd zeek
+        cd zeek-src
         ./configure --binary-package --enable-static-broker --enable-static-binpac --disable-spicy --disable-af-packet --disable-zeekctl --disable-python --disable-broker-tests --disable-auxtools --disable-archiver --osx-min-version=12
         make -j${{ steps.cpu-cores.outputs.count }}
         sudo make install
diff --git a/release.sh b/release.sh
index e99d520..9ce30fa 100755
--- a/release.sh
+++ b/release.sh
@@ -72,7 +72,6 @@ install_zeek_package salesforce/hassh 76a47abe9382109ce9ba530e7f1d7014a4a95209
 install_zeek_package salesforce/ja3 421dd4f3616b533e6971bb700289c6bb8355e707
 echo "@load policy/protocols/conn/community-id-logging" | $sudo tee -a $zeekpath/share/zeek/site/local.zeek
 
-mv zeek zeek-src
 mkdir -p zeek/bin zeek/lib/zeek zeek/share/zeek
 cp zeekrunner$exe zeek/
 cp $zeekpath/bin/zeek$exe zeek/bin/