From feb2a7335a9428f57abc4a86456829570b14f6f1 Mon Sep 17 00:00:00 2001
From: Tak2Hu <mhafizkusuma3@gmail.com>
Date: Thu, 12 Feb 2026 20:32:36 +0700
Subject: [PATCH 1/2] Update autogen script on virtualenv part

---
 autogen.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c77a73b..4f68014 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -865,23 +865,33 @@ setupPythonVirtualEnv(){
     VENV_EXEC="virtualenv"
   fi
 
+  local VENV_DIR="./venvfolder"
+  local VENV_ACTIVATE="$VENV_DIR/bin/activate"
+  if [ -f "$VENV_DIR/local/bin/activate" ]; then
+    VENV_ACTIVATE="$VENV_DIR/local/bin/activate"
+  fi
+
   #Setting up Virtual Python environment
-  if [ ! -f "./venvfolder/bin/activate" ]; then
-    $VENV_EXEC ./venvfolder 2>&1 | printlines project="virtualenv" task="setup"
+  if [ ! -f "$VENV_ACTIVATE" ]; then
+    $VENV_EXEC "$VENV_DIR" 2>&1 | printlines project="virtualenv" task="setup"
     if [ "${PIPESTATUS[0]}" -ne 0 ]; then
       printError project="virtualenv" task="setup" msg="failed to run python3 virtualenv.pyz"
       exit 1;
     fi
+    VENV_ACTIVATE="$VENV_DIR/bin/activate"
+    if [ -f "$VENV_DIR/local/bin/activate" ]; then
+      VENV_ACTIVATE="$VENV_DIR/local/bin/activate"
+    fi
   else
     printlines project="virtualenv" task="check" msg="found"
   fi
 
   #Activate virtual environment
-  if [[ ! -f "venvfolder/bin/activate" ]]; then
+  if [[ ! -f "$VENV_ACTIVATE" ]]; then
     printError project="virtualenv" task="activate" msg="failed to activate python virtual environment."
     exit 1;
   else
-    source venvfolder/bin/activate 
+    source "$VENV_ACTIVATE"
     printlines project="virtualenv" task="activate" msg="activated python virtual environment."
   fi
 
@@ -1708,4 +1718,4 @@ if [ "${PIPESTATUS[0]}" -ne 0 ]; then
   printError project="onvifmgr" task="build" msg="Failed to configure OnvifDeviceManager"
 else
   displaytime project="onvifmgr" task="build" time=$(( SECONDS - script_start )) msg="OnvifDeviceManager is ready to be built."$'\n'$'\t'"Simply run \"make -j\$(nproc)\"" label="Script runtime: "
-fi
\ No newline at end of file
+fi

From cd8138abac345a42219e87a57611f9c44a5f1a58 Mon Sep 17 00:00:00 2001
From: Tak2Hu <mhafizkusuma3@gmail.com>
Date: Fri, 13 Feb 2026 13:31:25 +0700
Subject: [PATCH 2/2] Chore: make virtualenv in autogen simpler

---
 autogen.sh | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4f68014..0afb05f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -865,33 +865,31 @@ setupPythonVirtualEnv(){
     VENV_EXEC="virtualenv"
   fi
 
-  local VENV_DIR="./venvfolder"
-  local VENV_ACTIVATE="$VENV_DIR/bin/activate"
-  if [ -f "$VENV_DIR/local/bin/activate" ]; then
-    VENV_ACTIVATE="$VENV_DIR/local/bin/activate"
-  fi
-
-  #Setting up Virtual Python environment
-  if [ ! -f "$VENV_ACTIVATE" ]; then
-    $VENV_EXEC "$VENV_DIR" 2>&1 | printlines project="virtualenv" task="setup"
+  # Setting up Virtual Python environment
+  if [ ! -f "./venvfolder/bin/activate" ] && [ ! -f "./venvfolder/local/bin/activate" ]; then
+    $VENV_EXEC ./venvfolder 2>&1 | printlines project="virtualenv" task="setup"
     if [ "${PIPESTATUS[0]}" -ne 0 ]; then
       printError project="virtualenv" task="setup" msg="failed to run python3 virtualenv.pyz"
       exit 1;
     fi
-    VENV_ACTIVATE="$VENV_DIR/bin/activate"
-    if [ -f "$VENV_DIR/local/bin/activate" ]; then
-      VENV_ACTIVATE="$VENV_DIR/local/bin/activate"
-    fi
   else
     printlines project="virtualenv" task="check" msg="found"
   fi
 
-  #Activate virtual environment
-  if [[ ! -f "$VENV_ACTIVATE" ]]; then
+  # Activate virtual environment
+  ACTIVATE=""
+
+  if [ -f "./venvfolder/bin/activate" ]; then
+    ACTIVATE="./venvfolder/bin/activate"
+  elif [ -f "./venvfolder/local/bin/activate" ]; then
+    ACTIVATE="./venvfolder/local/bin/activate"
+  fi
+
+  if [ -z "$ACTIVATE" ]; then
     printError project="virtualenv" task="activate" msg="failed to activate python virtual environment."
     exit 1;
   else
-    source "$VENV_ACTIVATE"
+    source "$ACTIVATE"
     printlines project="virtualenv" task="activate" msg="activated python virtual environment."
   fi