diff --git a/requirements.txt b/requirements.txt index 88ccc5f..a3831ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -urllib3<2 -requests -pystray \ No newline at end of file +urllib3==1.26.18 +requests==2.31.0 +pystray==0.19.5 \ No newline at end of file diff --git a/run.bat b/run.bat index ce77475..c2e16ad 100644 --- a/run.bat +++ b/run.bat @@ -1,15 +1,25 @@ @echo off -IF NOT EXIST .venv\Scripts\activate ( +set NAME=HotspotAutoLogin +set "requirementsFile=requirements.txt" +set VENV_PATH=.venv +set ACTIVATE_PATH=%VENV_PATH%\Scripts\activate + +IF NOT EXIST %ACTIVATE_PATH% ( echo Creating virtual environment... - virtualenv .venv - echo Virtual environment created. + virtualenv %VENV_PATH% ) echo Activating virtual environment... -call .venv\Scripts\activate +call %ACTIVATE_PATH% -echo Installing requirements... -pip install -r requirements.txt +echo Checking the requirements... +for /f "delims=" %%i in (%requirementsFile%) do ( + pip freeze | findstr /c:%%i > nul + if errorlevel 1 ( + echo Installing missing or outdated package: %%i + pip install %%i --upgrade --quiet + ) +) -echo Starting HotspotAutoLogin... -start /B "" ".venv/Scripts/pythonw.exe" HotspotAutoLogin.pyw \ No newline at end of file +echo Starting %NAME%... +start /B "" "%VENV_PATH%/Scripts/pythonw.exe" HotspotAutoLogin.pyw \ No newline at end of file