nsis/INIfiles/devkitProUpdate.ini

@@ -1,11 +1,11 @@
 [devkitProUpdate]
-Build=53
+Build=56
 URL=http://downloads.devkitpro.org
-Filename=devkitProUpdater-3.0.0.exe
+Filename=devkitProUpdater-3.0.3.exe
 
 [msys2]
 Version=2.10.0
-File=msys-2.10.0.7z
+File=msys-2.10.0.1.7z
 Size=118660
 
 [Settings]

nsis/devkitPro.nsi

@@ -15,13 +15,13 @@ RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "devkitProUpdater"
-!define PRODUCT_VERSION "3.0.0"
+!define PRODUCT_VERSION "3.0.3"
 !define PRODUCT_PUBLISHER "devkitPro"
 !define PRODUCT_WEB_SITE "http://www.devkitpro.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
-!define BUILD "53"
+!define BUILD "56"
 
 SetCompressor /SOLID lzma
 
@@ -32,6 +32,8 @@ SetCompressor /SOLID lzma
 !include "InstallOptions.nsh"
 !include "ReplaceInFile.nsh"
 !include "NTProfiles.nsh"
+!include LogicLib.nsh
+!include x64.nsh
 
 ;${StrTok}
 ${StrRep}
@@ -182,6 +184,10 @@ Section "NDS Development" SecNDSDev
 SectionEnd
 Section "3DS Development" Sec3DSDev
 SectionEnd
+Section "GameCube Development" SecGameCubeDev
+SectionEnd
+Section "Wii Development" SecWiiDev
+SectionEnd
 
 Section -installComponents
 
@@ -273,6 +279,16 @@ SkipMsys:
   push ${Sec3DSDev}
   call updateGroup
 
+  push "GameCubeDev"
+  push "gamecube-dev"
+  push ${SecGameCubeDev}
+  call updateGroup
+
+  push "WiiDev"
+  push "wii-dev"
+  push ${SecWiiDev}
+  call updateGroup
+
   push "SwitchDev"
   push "switch-dev"
   push ${SecSwitchDev}
@@ -342,9 +358,17 @@ Section Uninstall
   ReadRegStr $1 HKLM "System\CurrentControlSet\Control\Session Manager\Environment" "PATH"
   ${UnStrRep} $1 $1 "$INSTDIR\msys\bin;" ""
   ${UnStrRep} $1 $1 "$INSTDIR\msys2\usr\bin;" ""
+
+  StrCmp $1 "" 0 ResetPath
+
+  MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Trying to set path to blank string!$\nPlease reset path manually"
+  goto BlankedPath
+
+ResetPath:
   WriteRegExpandStr HKLM "System\CurrentControlSet\Control\Session Manager\Environment" "PATH" $1
   SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
 
+BlankedPath:
   DeleteRegKey HKCR ".pnproj"
   DeleteRegKey HKCR "PN2.pnproj.1\shell\open\command"
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
@@ -366,6 +390,8 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGP32Dev} "tools for GP32 development"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecNDSDev} "tools for NDS development"
   !insertmacro MUI_DESCRIPTION_TEXT ${Sec3DSDev} "tools for 3DS development"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGameCubeDev} "tools for GameCube development"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWiiDev} "tools for Wii development"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 var keepINI
@@ -374,6 +400,14 @@ var mirrorINI
 ;-----------------------------------------------------------------------------------------------------------------------
 Function .onInit
 ;-----------------------------------------------------------------------------------------------------------------------
+
+${If} ${RunningX64}
+${Else}
+  MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Sorry, this installer only supports 64 bit."
+  Quit
+${EndIf}  
+
+
   ; test existing ini file version
   ; if lower than build then use built in ini
   ifFileExists $EXEDIR\devkitProUpdate.ini +1 extractINI
@@ -480,6 +514,14 @@ installing:
   push ${Sec3DSDev}
   call checkEnabled
 
+  push "GameCubeDev"
+  push ${SecGameCubeDev}
+  call checkEnabled
+
+  push "WiiDev"
+  push ${SecWiiDev}
+  call checkEnabled
+
   push "SwitchDev"
   push ${SecSwitchDev}
   call checkEnabled
@@ -628,15 +670,15 @@ Function un.onInit
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove all devkitPro packages?" IDYES +2
   Abort
 
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are absolutely sure you want to do this?$\r$\nThis will remove the whole devkitPro folder and it's contents." IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you absolutely sure you want to do this?$\r$\nThis will remove the whole devkitPro folder and its contents." IDYES +2
   Abort
 
 FunctionEnd
 
 
 
 ;-----------------------------------------------------------------------------------------------------------------------
-; Check for a newer version of the installer, download and ask the user if he wants to run it
+; Check for a newer version of the installer, download and ask the user if they want to run it
 ;-----------------------------------------------------------------------------------------------------------------------
 Function UpgradedevkitProUpdate
 ;-----------------------------------------------------------------------------------------------------------------------
@@ -821,7 +863,7 @@ FunctionEnd
 ;-----------------------------------------------------------------------------------------------------------------------
 Function WhyDonate
 ;-----------------------------------------------------------------------------------------------------------------------
-  ExecShell "open" "http://devkitpro.org/support-devkitpro/"
+  ExecShell "open" "https://devkitpro.org/support-devkitpro/"
 FunctionEnd
 
 ;-----------------------------------------------------------------------------------------------------------------------