diff --git a/scripts/Latest.bat b/scripts/Latest.bat index a4f9e15b..6460a618 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -65,20 +65,23 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) ROBOCOPY "%root%NadekoBot" "%root%NadekoBot_Old" /MIR >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old files backed up to NadekoBot_Old + ECHO Old files backed up to NadekoBot_Old... ::Copies the credentials and database from the backed up data to the new folder COPY "%root%NadekoBot_Old\src\NadekoBot\credentials.json" "%installtemp%NadekoBot\src\NadekoBot\credentials.json" >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO credentials.json copied to new folder + ECHO credentials.json copied... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\bin" "%installtemp%NadekoBot\src\NadekoBot\bin" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old bin folder copied to new folder + ECHO bin folder copied... + RD /S /Q "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" + ECHO. + ECHO music cache cleared... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\data" "%installtemp%NadekoBot\src\NadekoBot\data" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old data folder copied to new folder + ECHO Old data folder copied... ::Moves the setup Nadeko folder RMDIR "%root%NadekoBot\" /S /Q >nul 2>&1 ROBOCOPY "%root%NadekoInstall_Temp" "%rootdir%" /E /MOVE >nul 2>&1 @@ -126,20 +129,21 @@ timeout /t 5 ECHO. ECHO Downloading libsodium.dll and opus.dll... SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" -bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile '%FILENAME%'" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" -bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile '%FILENAME%'" ECHO opus.dll downloaded. GOTO end :end ::Normal execution of end of script - TITLE Installation complete! + TITLE NadekoBot Installation complete! CD /D "%root%" RMDIR /S /Q "%installtemp%" >nul 2>&1 ECHO. - ECHO Installation complete, press any key to close this window! - timeout /t 5 - del Latest.bat + ECHO Installation complete! + ECHO. + PAUSE + del Latest.bat \ No newline at end of file diff --git a/scripts/NadekoAutoRun.bat b/scripts/NadekoAutoRun.bat index 90d88f4a..c1701c7c 100644 --- a/scripts/NadekoAutoRun.bat +++ b/scripts/NadekoAutoRun.bat @@ -25,13 +25,11 @@ IF ERRORLEVEL 1 GOTO latestar :latestar ECHO Auto Restart and Update with Dev Build (latest) ECHO Bot will auto update on every restart! -timeout /t 3 CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... -timeout /t 3 SET "FILENAME=%~dp0\Latest.bat" -bitsadmin.exe /transfer "Downloading Nadeko (Latest)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat -OutFile '%FILENAME%'" ECHO NadekoBot Dev Build (latest) downloaded. SET root=%~dp0 CD /D %root% @@ -41,13 +39,11 @@ GOTO latestar :stablear ECHO Auto Restart and Update with Stable Build ECHO Bot will auto update on every restart! -timeout /t 3 CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... -timeout /t 3 SET "FILENAME=%~dp0\Stable.bat" -bitsadmin.exe /transfer "Downloading Nadeko (Stable)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat -OutFile '%FILENAME%'" ECHO NadekoBot Stable build downloaded. SET root=%~dp0 CD /D %root% diff --git a/scripts/Stable.bat b/scripts/Stable.bat index f55fc958..b2f6a9eb 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -65,20 +65,23 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) ROBOCOPY "%root%NadekoBot" "%root%NadekoBot_Old" /MIR >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old files backed up to NadekoBot_Old + ECHO Old files backed up to NadekoBot_Old... ::Copies the credentials and database from the backed up data to the new folder COPY "%root%NadekoBot_Old\src\NadekoBot\credentials.json" "%installtemp%NadekoBot\src\NadekoBot\credentials.json" >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO credentials.json copied to new folder + ECHO credentials.json copied... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\bin" "%installtemp%NadekoBot\src\NadekoBot\bin" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old bin folder copied to new folder + ECHO bin folder copied... + RD /S /Q "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" + ECHO. + ECHO music cache cleared... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\data" "%installtemp%NadekoBot\src\NadekoBot\data" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old data folder copied to new folder + ECHO Old data folder copied... ::Moves the setup Nadeko folder RMDIR "%root%NadekoBot\" /S /Q >nul 2>&1 ROBOCOPY "%root%NadekoInstall_Temp" "%rootdir%" /E /MOVE >nul 2>&1 @@ -126,20 +129,21 @@ timeout /t 5 ECHO. ECHO Downloading libsodium.dll and opus.dll... SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" -bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile '%FILENAME%'" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" -bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile '%FILENAME%'" ECHO opus.dll downloaded. GOTO end :end ::Normal execution of end of script - TITLE Installation complete! + TITLE NadekoBot Installation complete! CD /D "%root%" RMDIR /S /Q "%installtemp%" >nul 2>&1 ECHO. - ECHO Installation complete, press any key to close this window! - timeout /t 5 - del Stable.bat + ECHO Installation complete! + ECHO. + PAUSE + del Stable.bat \ No newline at end of file