mirror of
https://github.com/SillyTavern/SillyTavern-Launcher.git
synced 2026-01-26 17:09:44 +00:00
Fixed ST Update Log Match | Tabby API Updater Streamlined.
Fixed ST launch match on update function. Changed Tabby API update process so confusing instructions are surpressed
This commit is contained in:
20
Launcher.bat
20
Launcher.bat
@@ -787,10 +787,24 @@ if %errorlevel% neq 0 (
|
||||
pause
|
||||
goto :update_manager_text_completion
|
||||
)
|
||||
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Updating tabbyAPI Dependencies in a new window...
|
||||
start cmd /k "title UPDATE TABBYAPI && cd /d %tabbyapi_install_path% && python start.py --update-deps && echo [41m WARNING: DO NOT FOLLOW INSTRUCTIONS FROM ABOVE BECAUSE THAT IS ONLY FOR USERS THAT DID NOT USE SILLYTAVERN-LAUNCHER TO INSTALL TABBYAPI. UPDATE INSTALLED, YOU CAN CLOSE THIS WINDOW NOW.[0m"
|
||||
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Updating tabbyAPI Dependencies...
|
||||
|
||||
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%tabbyAPI updated successfully.%reset%
|
||||
REM Run the update process and log the output
|
||||
python start.py --update-deps > tabby_update_log.txt 2>&1
|
||||
|
||||
REM Scan the log file for the specific success message
|
||||
findstr /c:"Dependencies updated. Please run TabbyAPI" tabby_update_log.txt >nul
|
||||
if %errorlevel% == 0 (
|
||||
echo [42m[INFO] TabbyAPI Updated[0m
|
||||
) else (
|
||||
echo [41m[ERROR] TabbyAPI Update Failed[0m
|
||||
)
|
||||
|
||||
REM Delete the log file
|
||||
del tabby_update_log.txt
|
||||
|
||||
REM Continue with the rest of the script
|
||||
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%tabbyAPI update process complete.%reset%
|
||||
pause
|
||||
goto :update_manager_text_completion
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Log file found, scan
|
||||
|
||||
:loop
|
||||
REM Use PowerShell to search for the error message
|
||||
powershell -Command "try { $content = Get-Content '%logs_st_console_path%' -Raw; if ($content -match 'Error: Cannot find module') { exit 1 } elseif ($content -match 'SillyTavern is listening on:') { exit 0 } else { exit 2 } } catch { exit 2 }"
|
||||
powershell -Command "try { $content = Get-Content '%logs_st_console_path%' -Raw; if ($content -match 'Error: Cannot find module') { exit 1 } elseif ($content -match 'SillyTavern is listening' -or $content -match 'Go to' -or $content -match '\[\s*\r?\n\s*\x27') { exit 0 } else { exit 2 } } catch { exit 2 }"
|
||||
set "ps_errorlevel=%errorlevel%"
|
||||
|
||||
if %ps_errorlevel% equ 0 (
|
||||
|
||||
Reference in New Issue
Block a user