diff --git a/windows-installer/BuildInstaller.bat b/windows-installer/BuildInstaller.bat index cc6ff74b..3a75afb2 100644 --- a/windows-installer/BuildInstaller.bat +++ b/windows-installer/BuildInstaller.bat @@ -48,28 +48,28 @@ if exist "%SCRIPTDIR%\Installer.7z" ( if NOT ["%SVZIP%"] == [""] ( "%SVZIP%" a "%SCRIPTDIR%\Installer.7z" "%SCRIPTDIR%\staging\*" ) - copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2.sfx" + "%SCRIPTDIR%\sfx\config-installer.txt" + "%SCRIPTDIR%\Installer.7z" "%SCRIPTDIR%\SRB2-%SRB2VERSIONNAME%-Installer.exe" + copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2.sfx" + "%SCRIPTDIR%\sfx\config-installer.txt" + "%SCRIPTDIR%\Installer.7z" "%SCRIPTDIR%\SRB2Kart-%SRB2VERSIONNAME%-Installer.exe" ) if exist "%SCRIPTDIR%\Patch.7z" ( if NOT ["%SVZIP%"] == [""] ( "%SVZIP%" a "%SCRIPTDIR%\Patch.7z" "%SCRIPTDIR%\staging\*" ) - copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2.sfx" + "%SCRIPTDIR%\sfx\config-patch.txt" + "%SCRIPTDIR%\Patch.7z" "%SCRIPTDIR%\SRB2-%SRB2VERSIONNAME%-Patch.exe" + copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2.sfx" + "%SCRIPTDIR%\sfx\config-patch.txt" + "%SCRIPTDIR%\Patch.7z" "%SCRIPTDIR%\SRB2Kart-%SRB2VERSIONNAME%-Patch.exe" ) if exist "%SCRIPTDIR%\Installer_x64.7z" ( if NOT ["%SVZIP%"] == [""] ( "%SVZIP%" a "%SCRIPTDIR%\Installer_x64.7z" "%SCRIPTDIR%\staging\*" ) - copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2_x64.sfx" + "%SCRIPTDIR%\sfx\config-installer.txt" + "%SCRIPTDIR%\Installer_x64.7z" "%SCRIPTDIR%\SRB2-%SRB2VERSIONNAME%-x64-Installer.exe" + copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2_x64.sfx" + "%SCRIPTDIR%\sfx\config-installer.txt" + "%SCRIPTDIR%\Installer_x64.7z" "%SCRIPTDIR%\SRB2Kart-%SRB2VERSIONNAME%-x64-Installer.exe" ) if exist "%SCRIPTDIR%\Patch_x64.7z" ( if NOT ["%SVZIP%"] == [""] ( "%SVZIP%" a "%SCRIPTDIR%\Patch_x64.7z" "%SCRIPTDIR%\staging\*" ) - copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2_x64.sfx" + "%SCRIPTDIR%\sfx\config-patch.txt" + "%SCRIPTDIR%\Patch_x64.7z" "%SCRIPTDIR%\SRB2-%SRB2VERSIONNAME%-x64-Patch.exe" + copy /y /b "%SCRIPTDIR%\sfx\7zsd_LZMA2_x64.sfx" + "%SCRIPTDIR%\sfx\config-patch.txt" + "%SCRIPTDIR%\Patch_x64.7z" "%SCRIPTDIR%\SRB2Kart-%SRB2VERSIONNAME%-x64-Patch.exe" ) del /f /q "%SCRIPTDIR%\staging\new-install\staging.txt" diff --git a/windows-installer/README.txt b/windows-installer/README.txt index 67995f33..51b8a7e9 100644 --- a/windows-installer/README.txt +++ b/windows-installer/README.txt @@ -1,5 +1,5 @@ Windows Install Builder -for SRB2 +for SRB2Kart This installer is much like the 7-Zip self-extracting archive, except this allows for scripting the post-install step. @@ -9,7 +9,7 @@ and program shortcuts. The included install scripts manage the game data location depending on the install location -- if installed in Program Files or AppData\Local, the -game data location is set to %UserProfile%\SRB2. +game data location is set to %UserProfile%\SRB2Kart. Program shortcuts are also added, as well as an uninstaller that will remove the icons and also selectively uninstall the core game files. @@ -31,7 +31,7 @@ How to Use 3. Set the text in VersionFilename.txt to the version identifier for the installer's filename. - * e.g., v2121 for v2.1.21, from "SRB2-v2121-Installer.exe" + * e.g., v102 for v1.0.2, from "SRB2Kart-v102-Installer.exe" * Also look through sfx/config-installer.txt and sfx/config-patch.txt and update the version strings. Templating is TODO. diff --git a/windows-installer/VersionFileName.txt b/windows-installer/VersionFileName.txt index 559abffe..c65b1654 100644 --- a/windows-installer/VersionFileName.txt +++ b/windows-installer/VersionFileName.txt @@ -1 +1 @@ -v2121 \ No newline at end of file +v102 \ No newline at end of file diff --git a/windows-installer/sfx/config-installer.txt b/windows-installer/sfx/config-installer.txt index bdbddea5..2811acc7 100644 --- a/windows-installer/sfx/config-installer.txt +++ b/windows-installer/sfx/config-installer.txt @@ -3,21 +3,19 @@ GUIFlags="8+32+64+4096" GUIMode="1" -Title="Sonic Robo Blast 2 v2.1.21" -BeginPrompt="Sonic Robo Blast 2 v2.1.21\nFull Installer\n\nSelect a folder to install SRB2 in.\n\nIf you install in \"AppData\\Local\" or \"Program Files\", your game data will be saved to:\n%UserProfile%\\SRB2\n\nOtherwise, your game data will be in the installation folder.\n\nShortcuts will be created in your Start Menu." +Title="Sonic Robo Blast 2 Kart v1.0.2" +BeginPrompt="Sonic Robo Blast 2 Kart v1.0.2\nFull Installer\n\nSelect a folder to install SRB2Kart in.\n\nIf you install in \"AppData\\Local\" or \"Program Files\", your game data will be saved to:\n%UserProfile%\\SRB2Kart\n\nOtherwise, your game data will be in the installation folder.\n\nShortcuts will be created in your Start Menu." ExtractPathText="Installation folder: (no exclamation points, please!)" -InstallPath="%LocalAppData%\\SRB2" +InstallPath="%LocalAppData%\\SRB2Kart" ExtractTitle="Installing..." -ExtractDialogText="Installing SRB2 v2.1.21...\n\nCheck out our modding community!\nWe make levels, characters, and much more!\n\nVisit http://www.srb2.org/mods" +ExtractDialogText="Installing SRB2Kart v1.0.2...\n\nCheck out our modding community!\nWe make levels, characters, and much more!\n\nVisit http://www.srb2.org/mods" -Shortcut="Pu,{%%T\\srb2win.exe},{},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2win.exe},{-win},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (Windowed)},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2win.exe},{-opengl},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (OpenGL)},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2win.exe},{-opengl -win},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (OpenGL, Windowed)},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2dd.exe},{},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (DirectDraw)},{%%T\\},{%%T\\srb2dd.exe},{0}" -Shortcut="Pu,{%%T\\srb2dd.exe},{-win},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (DirectDraw, Windowed)},{%%T\\},{%%T\\srb2dd.exe},{0}" -Shortcut="Pu,{%%T\\uninstall.exe},{},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{Uninstall SRB2},{%%T\\},{shell32.dll},{31}" +Shortcut="Pu,{%%T\\srb2kart.exe},{},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\srb2kart.exe},{-win},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart (Windowed)},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\srb2kart.exe},{-opengl},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart (OpenGL)},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\srb2kart.exe},{-opengl -win},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart (OpenGL, Windowed)},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\uninstall.exe},{},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{Uninstall SRB2Kart},{%%T\\},{shell32.dll},{31}" RunProgram="nowait:\"%%T\\new-install\\staging.bat\"" diff --git a/windows-installer/sfx/config-patch.txt b/windows-installer/sfx/config-patch.txt index bde6135d..2b516f8c 100644 --- a/windows-installer/sfx/config-patch.txt +++ b/windows-installer/sfx/config-patch.txt @@ -3,21 +3,19 @@ GUIFlags="8+32+64+4096" GUIMode="1" -Title="Sonic Robo Blast 2 v2.1.21" -BeginPrompt="Sonic Robo Blast 2 v2.1.21\nPatch Installer\n\nYou must have at least v2.1.15 to use this patch.\n\nSelect your current SRB2 folder.\n\nShortcuts will be created in your Start Menu." +Title="Sonic Robo Blast 2 Kart v1.0.2" +BeginPrompt="Sonic Robo Blast 2 Kart v1.0.2\nPatch Installer\n\nYou must have at least v1.0.0 to use this patch.\n\nSelect your current SRB2Kart folder.\n\nShortcuts will be created in your Start Menu." -ExtractPathText="Current SRB2 folder: (no exclamation points, please!)" -InstallPath="%LocalAppData%\\SRB2" +ExtractPathText="Current SRB2Kart folder: (no exclamation points, please!)" +InstallPath="%LocalAppData%\\SRB2Kart" ExtractTitle="Installing..." -ExtractDialogText="Installing SRB2 v2.1.21...\n\nCheck out our modding community!\nWe make levels, characters, and much more!\n\nVisit http://www.srb2.org/mods" +ExtractDialogText="Installing SRB2Kart v1.0.2...\n\nCheck out our modding community!\nWe make levels, characters, and much more!\n\nVisit http://www.srb2.org/mods" -Shortcut="Pu,{%%T\\srb2win.exe},{},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2win.exe},{-win},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (Windowed)},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2win.exe},{-opengl},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (OpenGL)},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2win.exe},{-opengl -win},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (OpenGL, Windowed)},{%%T\\},{%%T\\srb2win.exe},{0}" -Shortcut="Pu,{%%T\\srb2dd.exe},{},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (DirectDraw)},{%%T\\},{%%T\\srb2dd.exe},{0}" -Shortcut="Pu,{%%T\\srb2dd.exe},{-win},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{SRB2 (DirectDraw, Windowed)},{%%T\\},{%%T\\srb2dd.exe},{0}" -Shortcut="Pu,{%%T\\uninstall.exe},{},{Sonic Robo Blast 2},{Sonic Robo Blast 2 (SRB2), a 3D Sonic the Hedgehog fangame.},{Uninstall SRB2},{%%T\\},{shell32.dll},{31}" +Shortcut="Pu,{%%T\\srb2kart.exe},{},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\srb2kart.exe},{-win},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart (Windowed)},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\srb2kart.exe},{-opengl},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart (OpenGL)},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\srb2kart.exe},{-opengl -win},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{SRB2Kart (OpenGL, Windowed)},{%%T\\},{%%T\\srb2kart.exe},{0}" +Shortcut="Pu,{%%T\\uninstall.exe},{},{SRB2Kart},{Sonic Robo Blast 2 Kart (SRB2Kart), a Kart racer built on the SRB2 engine.},{Uninstall SRB2Kart},{%%T\\},{shell32.dll},{31}" RunProgram="nowait:\"%%T\\new-install\\staging.bat\"" diff --git a/windows-installer/sfx/config-uninstaller.txt b/windows-installer/sfx/config-uninstaller.txt index f3de9e26..2b35ad23 100644 --- a/windows-installer/sfx/config-uninstaller.txt +++ b/windows-installer/sfx/config-uninstaller.txt @@ -3,8 +3,8 @@ GUIFlags="1+2+8" GUIMode="2" -Title="Uninstall SRB2" -BeginPrompt="Are you sure you want to uninstall Sonic Robo Blast 2?\n\nYour game data and mods will be preserved, as well as\nany extra files in your install folder." +Title="Uninstall SRB2Kart" +BeginPrompt="Are you sure you want to uninstall Sonic Robo Blast 2 Kart?\n\nYour game data and mods will be preserved, as well as\nany extra files in your install folder." InstallPath="%%S" diff --git a/windows-installer/staging/! SRB2 INSTALL INSTRUCTIONS !.txt b/windows-installer/staging/! SRB2 INSTALL INSTRUCTIONS !.txt deleted file mode 100644 index f367296f..00000000 --- a/windows-installer/staging/! SRB2 INSTALL INSTRUCTIONS !.txt +++ /dev/null @@ -1,11 +0,0 @@ -SRB2 Install Instructions - -1. Move every file from the "new-install" folder to this main install folder. - -2. DELETE "staging.bat" and "staging.txt"! These can mess up your installation if run by accident! - -3. Optionally, create a folder in your user profile named "SRB2". This is where your game data and addons may live. For example, - - C:\Users\[User]\SRB2 - -4. Run the game! Double-click srb2win.exe -- or see if you have Start Menu icons under "Sonic Robo Blast 2". \ No newline at end of file diff --git a/windows-installer/staging/! SRB2KART INSTALL INSTRUCTIONS !.txt b/windows-installer/staging/! SRB2KART INSTALL INSTRUCTIONS !.txt new file mode 100644 index 00000000..91d055be --- /dev/null +++ b/windows-installer/staging/! SRB2KART INSTALL INSTRUCTIONS !.txt @@ -0,0 +1,11 @@ +SRB2Kart Install Instructions + +1. Move every file from the "new-install" folder to this main install folder. + +2. DELETE "staging.bat" and "staging.txt"! These can mess up your installation if run by accident! + +3. Optionally, create a folder in your user profile named "SRB2Kart". This is where your game data and addons may live. For example, + + C:\Users\[User]\SRB2Kart + +4. Run the game! Double-click srb2kart.exe -- or see if you have Start Menu icons under "SRB2Kart". \ No newline at end of file diff --git a/windows-installer/staging/new-install/old-install-list.txt b/windows-installer/staging/new-install/old-install-list.txt index 6f33660a..5fd2adc1 100644 --- a/windows-installer/staging/new-install/old-install-list.txt +++ b/windows-installer/staging/new-install/old-install-list.txt @@ -11,5 +11,4 @@ r_opengl.dll SDL2.dll SDL2_mixer.dll smpeg2.dll -srb2dd.exe -srb2win.exe \ No newline at end of file +srb2kart.exe \ No newline at end of file diff --git a/windows-installer/staging/new-install/staging.bat b/windows-installer/staging/new-install/staging.bat index 2c3c9491..85ca3fd4 100644 --- a/windows-installer/staging/new-install/staging.bat +++ b/windows-installer/staging/new-install/staging.bat @@ -4,18 +4,18 @@ setlocal enabledelayedexpansion cls -:: SRB2 Install Staging +:: SRB2Kart Install Staging :: :: This accomplishes the following tasks: :: -:: 1. Creates a user profile folder if SRB2 is installed in AppData or Program Files, and config.cfg is not already in the install folder +:: 1. Creates a user profile folder if SRB2Kart is installed in AppData or Program Files, and config.cfg is not already in the install folder :: :: 2. Moves old installation files into old-install :: :: 3. Moves new installaton files into install folder :: -:: Get Parent folder (the SRB2 install folder) +:: Get Parent folder (the SRB2Kart install folder) :: :: https://wiert.me/2011/08/30/batch-file-to-get-parent-directory-not-the-directory-of-the-batch-file-but-the-parent-of-that-directory/ @@ -62,16 +62,16 @@ mkdir "!INSTALLDIR!\install-dummy" :: TODO elevate automatically if errorlevel 1 ( - echo Finish installing SRB2 with these steps: + echo Finish installing SRB2Kart with these steps: echo. - echo 1. Go to your SRB2 install folder + echo 1. Go to your SRB2Kart install folder echo. echo !INSTALLDIR! echo. echo 2. Copy all files from the "new-install" subfolder into the main folder echo and DELETE staging.bat and staging.txt!!! echo. - echo 3. Optionally, create a folder in your user profile named "SRB2". + echo 3. Optionally, create a folder in your user profile named "SRB2Kart". echo This is where your game data and addons may live. echo To create the folder, go here: echo. @@ -92,7 +92,7 @@ if errorlevel 1 ( : CheckUserDir -:: Check if we need to create !userprofile!\SRB2 +:: Check if we need to create !userprofile!\SRB2Kart set "USERDIR=!INSTALLDIR!" @@ -130,7 +130,7 @@ goto MoveOldInstall : SetUserDir : CheckPermissionsUserDir -set "USERDIR=!UserProfile!\SRB2" +set "USERDIR=!UserProfile!\SRB2Kart" :: Check for permissions and create the folder if exist "!USERDIR!\*" ( @@ -170,18 +170,18 @@ echo !INSTALLDIR! >> "!USERDIR!\^! Data and Mods Go Here ^!.txt" echo. >> "!USERDIR!\^! Data and Mods Go Here ^!.txt" echo To run SRB2, go to: >> "!USERDIR!\^! Data and Mods Go Here ^!.txt" echo. >> "!USERDIR!\^! Data and Mods Go Here ^!.txt" -echo Start Menu ^> Programs ^> Sonic Robo Blast 2 >> "!USERDIR!\^! Data and Mods Go Here ^!.txt" +echo Start Menu ^> Programs ^> SRB2Kart >> "!USERDIR!\^! Data and Mods Go Here ^!.txt" :: Copy path to install folder set "SCRIPT=!TEMP!\!RANDOM!-!RANDOM!-!RANDOM!-!RANDOM!.vbs" echo Set oWS = WScript.CreateObject("WScript.Shell") >> "!SCRIPT!" -echo sLinkFile = "!USERDIR!\^! SRB2 Install Folder ^!.lnk" >> "!SCRIPT!" +echo sLinkFile = "!USERDIR!\^! SRB2Kart Install Folder ^!.lnk" >> "!SCRIPT!" echo Set oLink = oWS.CreateShortcut(sLinkFile) >> "!SCRIPT!" echo oLink.TargetPath = "!INSTALLDIR!" >> "!SCRIPT!" echo oLink.WorkingDirectory = "!INSTALLDIR!" >> "!SCRIPT!" echo oLink.Arguments = "" >> "!SCRIPT!" -echo oLink.IconLocation = "!INSTALLDIR!\srb2win.exe,0" >> "!SCRIPT!" +echo oLink.IconLocation = "!INSTALLDIR!\srb2kart.exe,0" >> "!SCRIPT!" echo oLink.Save >> "!SCRIPT!" cscript /nologo "!SCRIPT!" del "!SCRIPT!" @@ -190,12 +190,12 @@ del "!SCRIPT!" set "SCRIPT=!TEMP!\!RANDOM!-!RANDOM!-!RANDOM!-!RANDOM!.vbs" echo Set oWS = WScript.CreateObject("WScript.Shell") >> "!SCRIPT!" -echo sLinkFile = "!INSTALLDIR!\^! SRB2 Data Folder ^!.lnk" >> "!SCRIPT!" +echo sLinkFile = "!INSTALLDIR!\^! SRB2Kart Data Folder ^!.lnk" >> "!SCRIPT!" echo Set oLink = oWS.CreateShortcut(sLinkFile) >> "!SCRIPT!" echo oLink.TargetPath = "!USERDIR!" >> "!SCRIPT!" echo oLink.WorkingDirectory = "!USERDIR!" >> "!SCRIPT!" echo oLink.Arguments = "" >> "!SCRIPT!" -echo oLink.IconLocation = "!INSTALLDIR!\srb2win.exe,0" >> "!SCRIPT!" +echo oLink.IconLocation = "!INSTALLDIR!\srb2kart.exe,0" >> "!SCRIPT!" echo oLink.Save >> "!SCRIPT!" cscript /nologo "!SCRIPT!" del "!SCRIPT!" @@ -288,9 +288,9 @@ echo !USERDIR! > "!INSTALLDIR!\uninstall-userdir.txt" echo uninstall.bat>> "!INSTALLDIR!\uninstall-list.txt" echo uninstall-list.txt>> "!INSTALLDIR!\uninstall-list.txt" echo uninstall-userdir.txt>> "!INSTALLDIR!\uninstall-list.txt" -:: *ahem* Prints as ^! SRB2 Data Folder ^!.lnk +:: *ahem* Prints as ^! SRB2Kart Data Folder ^!.lnk :: We need to escape the exclamations (^^!) and the carets themselves (^^^^) -echo ^^^^^^! SRB2 Data Folder ^^^^^^!.lnk>> "!INSTALLDIR!\uninstall-list.txt" +echo ^^^^^^! SRB2Kart Data Folder ^^^^^^!.lnk>> "!INSTALLDIR!\uninstall-list.txt" :: Add the uninstall list files to the uninstall EXE @@ -317,7 +317,7 @@ for %%F in ("!STAGINGDIR!\*") DO ( : Finished -del /q /f "!INSTALLDIR!\^! SRB2 INSTALL INSTRUCTIONS ^!.txt" +del /q /f "!INSTALLDIR!\^! SRB2KART INSTALL INSTRUCTIONS ^!.txt" set MSGEXE= if exist "!SystemRoot!\System32\msg.exe" ( @@ -330,30 +330,30 @@ if exist "!SystemRoot!\System32\msg.exe" ( if ["!OLDINSTALLCHANGED!"] == ["1"] ( "!systemroot!\explorer.exe" /select, "!OLDINSTALLDIR!" - echo Finished^^! Some of your old installation files were moved to the "old-install" folder. > !TEMP!\srb2msgprompt.txt - echo. >> !TEMP!\srb2msgprompt.txt - echo If you no longer need these files, you may delete the folder safely. >> !TEMP!\srb2msgprompt.txt - echo. >> !TEMP!\srb2msgprompt.txt - echo To run SRB2, go to: Start Menu ^> Programs ^> Sonic Robo Blast 2. >> !TEMP!\srb2msgprompt.txt - !MSGEXE! "!username!" < !TEMP!\srb2msgprompt.txt - del !TEMP!\srb2msgprompt.txt + echo Finished^^! Some of your old installation files were moved to the "old-install" folder. > !TEMP!\srb2kartmsgprompt.txt + echo. >> !TEMP!\srb2kartmsgprompt.txt + echo If you no longer need these files, you may delete the folder safely. >> !TEMP!\srb2kartmsgprompt.txt + echo. >> !TEMP!\srb2kartmsgprompt.txt + echo To run SRB2Kart, go to: Start Menu ^> Programs ^> SRB2Kart. >> !TEMP!\srb2kartmsgprompt.txt + !MSGEXE! "!username!" < !TEMP!\srb2kartmsgprompt.txt + del !TEMP!\srb2kartmsgprompt.txt ) else ( if /I ["!USERDIR!"] == ["!INSTALLDIR!"] ( "!systemroot!\explorer.exe" "!INSTALLDIR!" - echo Finished^^! > !TEMP!\srb2msgprompt.txt - echo. >> !TEMP!\srb2msgprompt.txt - echo To run SRB2, go to: Start Menu ^> Programs ^> Sonic Robo Blast 2. >> !TEMP!\srb2msgprompt.txt - !MSGEXE! "!username!" < !TEMP!\srb2msgprompt.txt - del !TEMP!\srb2msgprompt.txt + echo Finished^^! > !TEMP!\srb2kartmsgprompt.txt + echo. >> !TEMP!\srb2kartmsgprompt.txt + echo To run SRB2Kart, go to: Start Menu ^> Programs ^> SRB2Kart. >> !TEMP!\srb2kartmsgprompt.txt + !MSGEXE! "!username!" < !TEMP!\srb2kartmsgprompt.txt + del !TEMP!\srb2kartmsgprompt.txt ) else ( "!systemroot!\explorer.exe" "!USERDIR!" - echo Finished^^! You may find your game data in this folder: > !TEMP!\srb2msgprompt.txt - echo. >> !TEMP!\srb2msgprompt.txt - echo !USERDIR! >> !TEMP!\srb2msgprompt.txt - echo. >> !TEMP!\srb2msgprompt.txt - echo To run SRB2, go to: Start Menu ^> Programs ^> Sonic Robo Blast 2. >> !TEMP!\srb2msgprompt.txt - !MSGEXE! "!username!" < !TEMP!\srb2msgprompt.txt - del !TEMP!\srb2msgprompt.txt + echo Finished^^! You may find your game data in this folder: > !TEMP!\srb2kartmsgprompt.txt + echo. >> !TEMP!\srb2kartmsgprompt.txt + echo !USERDIR! >> !TEMP!\srb2kartmsgprompt.txt + echo. >> !TEMP!\srb2kartmsgprompt.txt + echo To run SRB2Kart, go to: Start Menu ^> Programs ^> SRB2Kart. >> !TEMP!\srb2kartmsgprompt.txt + !MSGEXE! "!username!" < !TEMP!\srb2kartmsgprompt.txt + del !TEMP!\srb2kartmsgprompt.txt ) ) diff --git a/windows-installer/uninstaller/uninstall.bat b/windows-installer/uninstaller/uninstall.bat index ed7c3339..4a788425 100644 --- a/windows-installer/uninstaller/uninstall.bat +++ b/windows-installer/uninstaller/uninstall.bat @@ -15,7 +15,7 @@ if ["%1"] == ["/y"] ( set "PROCEED=1" ) else ( set PROCEED= - set /p PROCEED="Are you sure you want to uninstall SRB2? [yes/no] " + set /p PROCEED="Are you sure you want to uninstall SRB2Kart? [yes/no] " if /I ["!PROCEED:~0,1!"] == ["n"] exit if /I ["!PROCEED!"] == ["y"] ( @@ -46,7 +46,7 @@ mkdir "!INSTALLDIR!\uninstall-dummy" :: TODO elevate automatically if errorlevel 1 ( - echo We need Administrator Rights to uninstall SRB2. + echo We need Administrator Rights to uninstall SRB2Kart. echo. echo Try running this uninstaller by right-clicking on the icon echo and click "Run as administrator" @@ -105,7 +105,7 @@ echo Deleting your program icons... echo. cd \ -rmdir /s /q "!AppData!\Microsoft\Windows\Start Menu\Programs\Sonic Robo Blast 2" +rmdir /s /q "!AppData!\Microsoft\Windows\Start Menu\Programs\SRB2Kart" :: Check if our install folder is non-empty @@ -133,7 +133,7 @@ if /I NOT ["!USERDIR!"] == ["!INSTALLDIR!"] ( : Final -echo All done^^! Visit http://www.srb2.org if you want to play SRB2 again^^! +echo All done^^! Visit http://www.srb2.org if you want to play SRB2Kart again^^! echo. set "FINALPROMPT=Press Enter key to exit."