Changed some env logic

Author: lixelv

src/ControlHub.exe

@@ -10,6 +10,20 @@ type nul > "%PROGRAMDATA%\ControlHub\logs\error.log"
 
 icacls "%PROGRAMDATA%\ControlHub" /grant *S-1-5-32-545:(OI)(CI)M /T
 
+set "TARGET=%~dp0python"
+
+:: Remove existing permissions
+icacls "%TARGET%" /reset /T /C /Q
+
+:: Remove all inherited permissions
+icacls "%TARGET%" /inheritance:r /remove:g /T /C /Q
+
+:: Recursively grant full control to Everyone, Users, and specific SIDs
+icacls "%TARGET%" /grant Everyone:(OI)(CI)F /T /C /Q
+icacls "%TARGET%" /grant Users:(OI)(CI)F /T /C /Q
+icacls "%TARGET%" /grant *S-1-5-32-545:(OI)(CI)F /T /C /Q
+icacls "%TARGET%" /grant *S-1-5-32-544:(OI)(CI)F /T /C /Q
+
 :: Download and install pip requirements
 :: python\ipython.bat -m pip install --upgrade -r requirements.txt
 

src/install.bat

@@ -1,8 +1,16 @@
 @echo off
+setlocal
+
+if defined CONTROLHUB (
+    set "BASE_DIR=%CONTROLHUB%\python\"
+) else (
+    set "BASE_DIR=%~dp0"
+)
+
 set PYTHONNOUSERSITE=1
 set PYTHONUSERBASE=
 set PIP_USER=false
 set PIP_PREFIX=
-set PIP_TARGET=%~dp0Lib\site-packages
+set PIP_TARGET=%BASE_DIR%Lib\site-packages
 
-"%~dp0python.exe" %*
+"%BASE_DIR%python.exe" %*

src/ipython.bat

@@ -33,6 +33,18 @@
 app_path = os.getcwd()
 python_executable = os.path.join(app_path, "python", "ipython.bat")
 
+python_lib_path = os.path.join(app_path, "python", "Lib", "site-packages")
+python_env = {
+    "PYTHONNOUSERSITE": "1",
+    "PYTHONUSERBASE": "",
+    "PYTHONPATH": python_lib_path,
+    "PIP_USER": "false",
+    "PIP_PREFIX": "",
+    "PIP_TARGET": python_lib_path,
+    "PYTHONIOENCODING": "utf-8",
+    "PYTHONUTF8": "1",
+}
+
 program_data = os.getenv("PROGRAMDATA")
 logs_base = os.path.join(program_data, "ControlHub")
 logs_path = os.path.join(logs_base, "logs")
@@ -158,15 +170,14 @@ async def run_command(
             creationflags = subprocess.CREATE_NO_WINDOW
 
             process = await asyncio.create_subprocess_exec(
-                *command,
+                *("cmd", "/C", *command),
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
                 creationflags=creationflags,
                 cwd=cwd,
                 env={
                     **os.environ,
-                    "PYTHONIOENCODING": "utf-8",
-                    "PYTHONUTF8": "1",
+                    **python_env,
                     **additional_env,
                 },
             )