From c29d9f768f14f44294c9533c31592371663f82f3 Mon Sep 17 00:00:00 2001
From: aouinizied <aouinizied@gmail.com>
Date: Fri, 25 Mar 2022 23:51:59 +0100
Subject: [PATCH] [WIP] Improve CI.

---
 nfstream/engine/dependencies/build.sh | 10 +++++++---
 setup.py                              |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nfstream/engine/dependencies/build.sh b/nfstream/engine/dependencies/build.sh
index 6e448a5..7953d14 100755
--- a/nfstream/engine/dependencies/build.sh
+++ b/nfstream/engine/dependencies/build.sh
@@ -61,10 +61,11 @@ build_libndpi() {
   echo "Compiling libndpi"
   echo "---------------------------------------------------------------------------------------------------------------"
   cd nDPI
-  ./autogen.sh
-  ./configure CFLAGS="-I/tmp/nfstream_build/usr/local/include" LDFLAGS="-L/tmp/nfstream_build/usr/local/lib" --with-local-libgcrypt --with-only-libndpi
+  ./autogen.sh --with-local-libgcrypt
+  ./configure CFLAGS="-I/tmp/nfstream_build/usr/local/include" LDFLAGS="-L/tmp/nfstream_build/usr/local/lib"
+  cd src/lib
   make
-  cd ..
+  cd ../..
   echo "---------------------------------------------------------------------------------------------------------------"
   echo ""
   }
@@ -78,6 +79,9 @@ build_libgpgerror
 build_libgcrypt
 build_libndpi
 
+# Remove temporary build directory
+rm -rf /tmp/nfstream_build
+
 
 
 
diff --git a/setup.py b/setup.py
index aa38542..17b37c7 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,7 @@ class BuildNativeCommand(build_ext):
             )
             print(build_script_command)
             msys2 = shutil.which('msys2')
-            subprocess.check_call([msys2, "-c", build_script_command], shell=False)
+            subprocess.check_call([msys2, "-c", build_script_command])
         else:
             subprocess.check_call([str(BUILD_SCRIPT_PATH)])
         # Build engine