From 392718a615f10c62e710eca46a095cb37928fe1b Mon Sep 17 00:00:00 2001 From: canni0 Date: Tue, 30 Sep 2008 10:33:47 +0000 Subject: - New installer source for v.1.1 - Added new demo song git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1427 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 425 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 425 insertions(+) create mode 100644 installer/UltraStar Deluxe.nsi (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi new file mode 100644 index 00000000..59754466 --- /dev/null +++ b/installer/UltraStar Deluxe.nsi @@ -0,0 +1,425 @@ +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; UltraStar Deluxe Installer - Version 1.1: Main +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!include MUI2.nsh +!include "WinVer.nsh" +!include "LogicLib.nsh" + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Variables +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Installer Paths: + +!define path_settings ".\settings" +!define path_languages ".\languages" +!define path_images "..\installerdependencies\images" +!define path_plugins "..\installerdependencies\plugins" +!define path_gdf "..\installerdependencies\gdf" + +!addPluginDir "${path_plugins}\" + +!include "${path_settings}\variables.nsh" +!include "${path_settings}\GameExplorer.nsh" +!include "${path_settings}\functions.nsh" + + + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Export Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +SetCompress Auto +SetCompressor /SOLID lzma +SetCompressorDictSize 32 +SetDatablockOptimize On + +Name "${name} V.${version}" +Brandingtext "${name} Installation" +OutFile "ultrastardx-${version}-installer-full.exe" + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Interface Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; Icons: + +!define MUI_ICON "${path_images}\${img_install}" +!define MUI_UNICON "${path_images}\${img_uninstall}" + +; Header and Side Images: + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "${path_images}\${img_header}" +!define MUI_HEADERIMAGE_UNBITMAP "${path_images}\${img_header}" + +!define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" + +; Settings: + + +; Abort Warnings: + +!define MUI_ABORTWARNING +!define MUI_ABORTWARNING_TEXT "$(abort_install)" +!define MUI_ABORTWARNING_CANCEL_DEFAULT + +!define MUI_UNABORTWARNING +!define MUI_UNABORTWARNING_TEXT "$(abort_uninstall)" +!define MUI_UNABORTWARNING_CANCEL_DEFAULT + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages Installation Routine Settings +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +; License Page: + +!define MUI_LICENSEPAGE_RADIOBUTTONS + +; Components Page: + +!define MUI_COMPONENTSPAGE_SMALLDESC +!define MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO $(page_components_info) + +; Finish Pages: + +!define MUI_FINISHPAGE_TITLE_3LINES + +!define MUI_FINISHPAGE_TEXT_LARGE +!define MUI_FINISHPAGE_TEXT "$(page_finish_txt)" + +!define MUI_FINISHPAGE_RUN "$INSTDIR\${exe}.exe" +!define MUI_FINISHPAGE_RUN_NOTCHECKED + +!define MUI_FINISHPAGE_LINK "$(page_finish_linktxt)" +!define MUI_FINISHPAGE_LINK_LOCATION "${homepage}" + +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +!define MUI_FINISHPAGE_NOREBOOTSUPPORT + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages Installation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "${license}" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY + +; Start menu page + +var ICONS_GROUP +!define MUI_STARTMENUPAGE_NODISABLE +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" +!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP + +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Pages UnInstallation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Sections Installation Routine +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +;------------------------------------ +; MAIN COMPONENTS (Section 1) +;------------------------------------ + +Section $(name_section1) Section1 + SectionIn RO + SetOutPath $INSTDIR + SetOverwrite try + +!include "${path_settings}\files_main_install.nsh" + + +; Create Shortcuts: + +SetOutPath "$INSTDIR" + +!insertmacro MUI_STARTMENU_WRITE_BEGIN Application + + SetShellVarContext all + SetOutPath "$INSTDIR" + + CreateDirectory "${name}" + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${name}.lnk" "$INSTDIR\${exe}.exe" +; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_license).lnk" "$INSTDIR\License.txt" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" + !insertmacro MUI_STARTMENU_WRITE_END + +; Vista Game Explorer: + +${If} ${AtLeastWinVista} + +${GameExplorer_GenerateGUID} +Pop $0 + +${GameExplorer_AddGame} all "${path_gdf}" $WINDIR $INSTDIR\${exe}.exe $0 + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \ + "$INSTDIR\${exe}.exe" "-Benchmark" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \ + "$INSTDIR\${exe}.exe" "-Joypad" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \ + "$INSTDIR\${exe}.exe" "-FullScreen" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \ + "$INSTDIR\${exe}.exe" "-Screen 2" + +CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0 +CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \ + "http://forum.ultrastardeluxe.org" + +${EndIf} + +; Create Uninstaller: + + WriteUninstaller "$INSTDIR\Uninstall.exe" + + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${p_name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" + + SetOutPath "$INSTDIR" + +SectionEnd + +;------------------------------------ +; OPTIONAL SONGS (Section 2) +;------------------------------------ + +SectionGroup $(name_section2) Section2 + +; +; Dead Smiling Pirates - I 18 +; + +Section /o "Dead Smiling Pirates - I 18" g2Section1 +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18" + SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-I-18.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + + Delete "$TEMP\Song-I-18.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +; +; Steven Dunston - Northern Star +; + +Section /o "Joshua Morin - On the run" g2Section2 +; AddSize 2200 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\Songs\Joshua Morin - On the run" + SetOutPath "$INSTDIR\Songs\Joshua Morin - On the run\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On the run\" + + Delete "$TEMP\Song-On-the-run.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Pornophonique - Space Invaders" g2Section3 +; AddSize 2200 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders" + SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-Space-Invaders.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" + + Delete "$TEMP\Song-Space-Invaders.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Steven Dunston - Northern Star" g2Section4 +; AddSize 1500 + SetOverwrite try + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star" + SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-Northern-Star.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" + + Delete "$TEMP\Song-Northern-Star.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +;------------------------------------ +; OPTIONAL THEMES (Section 3) +;------------------------------------ + +SectionGroup $(name_section3) Section3 + + Section "Orange" g3Section1 +; AddSize 700 + +; Download theme orange: + NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-Orange.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section "Streetlight" g3Section2 +; AddSize 1000 + +; Download theme Streetlight: + NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-Streetlight.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section "Vistar" g3Section3 +; AddSize 1000 + +; Download theme Vistar: + + NSISdl::download /TIMEOUT=30000 ${download_theme3} $TEMP\Theme-Vistar.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-Vistar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +;------------------------------------ +; UNINSTALL (Section 4) +;------------------------------------ + +Section Uninstall + + !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP + + !include "${path_settings}\files_opt_uninstall.nsh" + !include "${path_settings}\files_main_uninstall.nsh" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + +; Unregister from Windows Vista Game Explorer + +${If} ${AtLeastWinVista} + +${GameExplorer_RemoveGame} $0 + +${EndIf} + +SectionEnd + +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Language Support +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "German" + +!include "${path_languages}\English.nsh" +!include "${path_languages}\German.nsh" + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +Function un.onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd -- cgit v1.2.3 From f8df3baf3415fbea2c56eaebca2def446c15c71b Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 3 Oct 2008 16:00:23 +0000 Subject: - Fixed Welcome Page - Added Sections and LangStrings - Exported and merged language files for easier multi language support git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1431 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 108 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 95 insertions(+), 13 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 59754466..78e448fc 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -24,8 +24,6 @@ !include "${path_settings}\GameExplorer.nsh" !include "${path_settings}\functions.nsh" - - ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Export Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -57,9 +55,6 @@ OutFile "ultrastardx-${version}-installer-full.exe" !define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}" -; Settings: - - ; Abort Warnings: !define MUI_ABORTWARNING @@ -74,6 +69,12 @@ OutFile "ultrastardx-${version}-installer-full.exe" ; Pages Installation Routine Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Welcome Page: + +!define MUI_WELCOMEPAGE_TITLE_3LINES +!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)" +!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)" + ; License Page: !define MUI_LICENSEPAGE_RADIOBUTTONS @@ -202,7 +203,7 @@ ${EndIf} WriteUninstaller "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${p_name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" @@ -248,12 +249,12 @@ SectionEnd ; Steven Dunston - Northern Star ; -Section /o "Joshua Morin - On the run" g2Section2 +Section /o "Joshua Morin - On The Run" g2Section2 ; AddSize 2200 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Joshua Morin - On the run" - SetOutPath "$INSTDIR\Songs\Joshua Morin - On the run\" + CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run" + SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip @@ -262,7 +263,7 @@ Section /o "Joshua Morin - On the run" g2Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On the run\" + nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" Delete "$TEMP\Song-On-the-run.zip" @@ -322,7 +323,7 @@ SectionGroupEnd SectionGroup $(name_section3) Section3 - Section "Orange" g3Section1 + Section /o "Orange" g3Section1 ; AddSize 700 ; Download theme orange: @@ -340,7 +341,7 @@ SectionGroup $(name_section3) Section3 SectionEnd - Section "Streetlight" g3Section2 + Section /o "Streetlight" g3Section2 ; AddSize 1000 ; Download theme Streetlight: @@ -358,7 +359,7 @@ SectionEnd SectionEnd - Section "Vistar" g3Section3 + Section /o "Vistar" g3Section3 ; AddSize 1000 ; Download theme Vistar: @@ -375,6 +376,63 @@ SectionEnd SetOutPath "$INSTDIR" +SectionEnd + + Section /o "BlueSensation" g3Section4 +; AddSize 1000 + +; Download theme BlueSensation: + + NSISdl::download /TIMEOUT=30000 ${download_theme4} $TEMP\Theme-BlueSensation.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-BlueSensation.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section /o "WiiStar" g3Section5 +; AddSize 1000 + +; Download theme WiiStar: + + NSISdl::download /TIMEOUT=30000 ${download_theme5} $TEMP\Theme-WiiStar.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-WiiStar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section /o "iStar" g3Section6 +; AddSize 1000 + +; Download theme iStar: + + NSISdl::download /TIMEOUT=30000 ${download_theme6} $TEMP\Theme-iStar.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-iStar.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-iStar.zip" + + SetOutPath "$INSTDIR" + SectionEnd SectionGroupEnd @@ -402,6 +460,30 @@ ${EndIf} SectionEnd +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +; Section Descriptions +; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ + + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) + + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6) + +!insertmacro MUI_FUNCTION_DESCRIPTION_END + ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Language Support ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -- cgit v1.2.3 From 6ecfb5323b83021c68c693e5173c32b6ea9cd62a Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 4 Oct 2008 16:19:17 +0000 Subject: - fixed: default install dir hover descriptions vista game explorer shortcut - request privileges on vista - added settings page git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1432 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 143 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 135 insertions(+), 8 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 78e448fc..87079682 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -3,8 +3,9 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ !include MUI2.nsh -!include "WinVer.nsh" -!include "LogicLib.nsh" +!include WinVer.nsh +!include LogicLib.nsh +!include InstallOptions.nsh ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Variables @@ -16,7 +17,7 @@ !define path_languages ".\languages" !define path_images "..\installerdependencies\images" !define path_plugins "..\installerdependencies\plugins" -!define path_gdf "..\installerdependencies\gdf" +!define path_gdf "$WINDIR\gdf.dll" !addPluginDir "${path_plugins}\" @@ -33,10 +34,18 @@ SetCompressor /SOLID lzma SetCompressorDictSize 32 SetDatablockOptimize On +XPStyle on + Name "${name} V.${version}" -Brandingtext "${name} Installation" +Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe" +InstallDir "$PROGRAMFILES\${name}" + +; Windows Vista: + +RequestExecutionLevel user + ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Interface Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -97,6 +106,10 @@ OutFile "ultrastardx-${version}-installer-full.exe" !define MUI_FINISHPAGE_LINK "$(page_finish_linktxt)" !define MUI_FINISHPAGE_LINK_LOCATION "${homepage}" +!define MUI_FINISHPAGE_SHOWREADME +!define MUI_FINISHPAGE_SHOWREADME_TEXT $(page_finish_desktop) +!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortCuts + !define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_UNFINISHPAGE_NOAUTOCLOSE @@ -122,6 +135,81 @@ var ICONS_GROUP !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP !insertmacro MUI_PAGE_INSTFILES + +; USDX Settings Page + +Page custom Settings + +Function Settings + +!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" + + !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" + +; Get all the variables: + +var /GLOBAL fullscreen +var /GLOBAL language2 +var /GLOBAL resolution +var /GLOBAL tabs +var /GLOBAL animations + + !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State" + !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State" + !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State" + !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State" + !insertmacro INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State" + +; Write all variables to config.ini + +FileOpen $0 '$INSTDIR\config.ini' w +FileWrite $0 '[Game]$\r$\n' +FileClose $0 + +${If} $language2 != "" + +${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${If} $tabs != "" + +${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${WriteToConfig} "[Graphics]$\r$\n" "$INSTDIR\config.ini" + +${If} $fullscreen != "" + +${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${If} $resolution != "" + +${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" + +; Animations On / Off Tasks + +${If} $animations == "Off" + +${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini" + +${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini" + +${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + + +FunctionEnd ; Settings page End + + !insertmacro MUI_PAGE_FINISH ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -160,7 +248,7 @@ SetOutPath "$INSTDIR" CreateDirectory "${name}" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${name}.lnk" "$INSTDIR\${exe}.exe" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" ; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt" @@ -191,7 +279,7 @@ CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscree CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \ - "$INSTDIR\${exe}.exe" "-Screen 2" + "$INSTDIR\${exe}.exe" "-Screens 2" CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0 CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \ @@ -466,6 +554,7 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) @@ -491,17 +580,55 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" -!include "${path_languages}\English.nsh" -!include "${path_languages}\German.nsh" +!insertmacro MUI_RESERVEFILE_LANGDLL + +!include "${path_languages}\*.nsh" Function .onInit + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' + + Pop $R0 + + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) + Abort + + ReadRegStr $R0 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ + "UninstallString" + StrCmp $R0 "" done + + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ + IDYES done + Abort + + +done: + !insertmacro MUI_LANGDLL_DISPLAY + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" + FunctionEnd Function un.onInit + ${nsProcess::FindProcess} "USdx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end + + closeit: + ${nsProcess::KillProcess} "USdx.exe" $R0 + goto continue + + end: + ${nsProcess::Unload} + Abort + + continue: !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd -- cgit v1.2.3 From ad2d64765a945a79255c27f1ac8cb37366e486c1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 13:08:38 +0000 Subject: - Added Update Installation (version comparison) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1436 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 87079682..882a1c9a 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -36,7 +36,7 @@ SetDatablockOptimize On XPStyle on -Name "${name} V.${version}" +Name "${name} v.${version}" Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe" @@ -533,7 +533,6 @@ Section Uninstall !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP - !include "${path_settings}\files_opt_uninstall.nsh" !include "${path_settings}\files_main_uninstall.nsh" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" @@ -546,6 +545,8 @@ ${GameExplorer_RemoveGame} $0 ${EndIf} + + SectionEnd ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -586,6 +587,10 @@ SectionEnd Function .onInit +var /GLOBAL version +StrCpy $version "1.1a" + + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' Pop $R0 @@ -594,16 +599,26 @@ Function .onInit MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) Abort - ReadRegStr $R0 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ - "UninstallString" - StrCmp $R0 "" done + ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "${name} $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ - IDYES done - Abort + ${If} $R0 == $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ + IDYES done + Abort + ${EndIf} + ReadRegStr $R1 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ + "UninstallString" + StrCmp $R1 "" done + + ${If} $R0 != $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ + IDYES done + Abort + ${EndIf} done: -- cgit v1.2.3 From 910e332b427f28092a0f34124af753da5845f62f Mon Sep 17 00:00:00 2001 From: canni0 Date: Wed, 8 Oct 2008 16:11:16 +0000 Subject: - Added uninstall routine git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1439 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 882a1c9a..1e71e28c 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -1,5 +1,5 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ -; UltraStar Deluxe Installer - Version 1.1: Main +; UltraStar Deluxe Installer: Main ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ !include MUI2.nsh -- cgit v1.2.3 From f792ac7b80cda072af5ba2472c9f30c3a2feb9c1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Thu, 25 Dec 2008 20:13:20 +0000 Subject: - added jonathan coulton songs - small installer fixes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1542 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 542 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 541 insertions(+), 1 deletion(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 1e71e28c..c8df95dd 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -334,7 +334,521 @@ Section /o "Dead Smiling Pirates - I 18" g2Section1 SectionEnd ; -; Steven Dunston - Northern Star +; Jonathan Coulton Songs +; + +SectionGroup $(name_s2_sub1) s2_sub1 + +Section /o "Monkey Shines" s2_sub1_Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "I Crush Everything" s2_sub1_Section2 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-ICE.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Not About You" s2_sub1_Section3 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-NAY.zip" + + SetOutPath "$INSTDIR" + + +SectionEnd + +Section /o "Mr. Fancy Pants" s2_sub1_Section4 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-MFP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Big Bad World One" s2_sub1_Section5 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-BBWO.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Flickr" s2_sub1_Section6 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-Flickr.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "My Beige Bear" s2_sub1_Section7 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-MBB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "The Future Soon" s2_sub1_Section8 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-TFS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Ikea" s2_sub1_Section9 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-Ikea.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Furry Old Lobster" s2_sub1_Section10 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-FOL.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Code Monkey" s2_sub1_Section11 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-CM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "I´m Your Moon" s2_sub1_Section12 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-IYM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "First Of May" s2_sub1_Section13 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-FOM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-DSJD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "A Walk With George" s2_sub1_Section15 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-AWWG.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Creepy Doll" s2_sub1_Section16 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-CD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "That Spells DNA" s2_sub1_Section17 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-TSDNA.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "When You Go" s2_sub1_Section18 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-WYG.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Better" s2_sub1_Section19 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-Better.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shop Vac" s2_sub1_Section20 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-SV.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "I Feel Fantastic" s2_sub1_Section21 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-IFF.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Re: Your Brains" s2_sub1_Section22 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-ReYB.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Skullcrusher Mountain" s2_sub1_Section23 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-SCM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Chiron Beta Prime" s2_sub1_Section24 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-JC-CBP.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + +SectionGroupEnd + +; +; Joshua Morin - On The Run ; Section /o "Joshua Morin - On The Run" g2Section2 @@ -558,6 +1072,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) @@ -565,6 +1080,31 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) -- cgit v1.2.3 From 86c75b3e82dff54c8e6a9020a6fd236b6c7339fe Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 10 Apr 2009 15:46:34 +0000 Subject: - added songs (wise guys, bodo wartke, shearer) and themes (whitesensation, bluesensation 5.1) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1664 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 314 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 306 insertions(+), 8 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index c8df95dd..e512203c 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -307,11 +307,33 @@ SectionEnd SectionGroup $(name_section2) Section2 +Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-BodoWartke-LoveSong.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-BodoWartke-LoveSong.zip" + + SetOutPath "$INSTDIR" + + +SectionEnd + ; ; Dead Smiling Pirates - I 18 ; -Section /o "Dead Smiling Pirates - I 18" g2Section1 +Section /o "Dead Smiling Pirates - I 18" g2Section2 ; AddSize 1400 SetOverwrite try SetOutPath "$INSTDIR" @@ -851,7 +873,7 @@ SectionGroupEnd ; Joshua Morin - On The Run ; -Section /o "Joshua Morin - On The Run" g2Section2 +Section /o "Joshua Morin - On The Run" g2Section3 ; AddSize 2200 SetOverwrite try SetOutPath "$INSTDIR" @@ -859,7 +881,7 @@ Section /o "Joshua Morin - On The Run" g2Section2 SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -873,7 +895,7 @@ Section /o "Joshua Morin - On The Run" g2Section2 SectionEnd -Section /o "Pornophonique - Space Invaders" g2Section3 +Section /o "Pornophonique - Space Invaders" g2Section4 ; AddSize 2200 SetOverwrite try SetOutPath "$INSTDIR" @@ -895,7 +917,200 @@ Section /o "Pornophonique - Space Invaders" g2Section3 SectionEnd -Section /o "Steven Dunston - Northern Star" g2Section4 +SectionGroup $(name_s2_sub2) s2_sub2 + +Section /o "Shearer - 69" s2_sub2_Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-69.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-69-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Can't stop it" s2_sub2_Section3 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-CSI.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-CSI-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - In My Hand" s2_sub2_Section5 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-IMH.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Man Song" s2_sub2_Section6 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-MS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-MS-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Stay With Me" s2_sub2_Section8 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-SWM.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-Shearer-SWM-Kar.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + +Section /o "Steven Dunston - Northern Star" g2Section5 ; AddSize 1500 SetOverwrite try SetOutPath "$INSTDIR" @@ -903,7 +1118,7 @@ Section /o "Steven Dunston - Northern Star" g2Section4 SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -917,6 +1132,52 @@ Section /o "Steven Dunston - Northern Star" g2Section4 SectionEnd +SectionGroup $(name_s2_sub3) s2_sub3 + +Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-WiseGuys-LUKUS.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 + +; AddSize 1400 + SetOverwrite try + SetOutPath "$INSTDIR\Songs\" + +; Download song: + NSISdl::download /TIMEOUT=30000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip + + Pop $R0 + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" + + Delete "$TEMP\Song-WiseGuys-MWBD.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + +SectionGroupEnd + SectionGroupEnd ;------------------------------------ @@ -999,7 +1260,27 @@ SectionEnd SectionEnd - Section /o "WiiStar" g3Section5 + + Section /o "WhiteSensation" g3Section5 +; AddSize 1000 + +; Download theme WhiteSensation: + + NSISdl::download /TIMEOUT=30000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip + + Pop $R0 ;Get the return value + StrCmp $R0 "success" dlok + MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK + dlok: + nsisunz::Unzip "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" + + Delete "$TEMP\Theme-WhiteSensation.zip" + + SetOutPath "$INSTDIR" + +SectionEnd + + Section /o "WiiStar" g3Section6 ; AddSize 1000 ; Download theme WiiStar: @@ -1018,7 +1299,7 @@ SectionEnd SectionEnd - Section /o "iStar" g3Section6 + Section /o "iStar" g3Section7 ; AddSize 1000 ; Download theme iStar: @@ -1073,12 +1354,15 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) @@ -1105,12 +1389,26 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5) !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7) !insertmacro MUI_FUNCTION_DESCRIPTION_END -- cgit v1.2.3 From fb4faa444f4ebee1ebed08b3493fd0be667d2b51 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 10 Apr 2009 15:58:16 +0000 Subject: - corrected download links git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1665 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index e512203c..2b2dcbdf 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -314,7 +314,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-BodoWartke-LoveSong.zip + NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip Pop $R0 StrCmp $R0 "success" dlok @@ -341,7 +341,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-I-18.zip + NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-I-18.zip Pop $R0 StrCmp $R0 "success" dlok @@ -881,7 +881,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -903,7 +903,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4 SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-Space-Invaders.zip + NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Space-Invaders.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1118,7 +1118,7 @@ Section /o "Steven Dunston - Northern Star" g2Section5 SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1134,7 +1134,7 @@ SectionEnd SectionGroup $(name_s2_sub3) s2_sub3 -Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 +Section /o "Wise Guys - Lebendig und kraeftig und schaerfer" s2_sub3_Section1 ; AddSize 1400 SetOverwrite try -- cgit v1.2.3 From 1d9233874262457db5b454e3db9401234bea3cfe Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 10 Apr 2009 16:11:57 +0000 Subject: - replaced unzip method (fixes german umlaute problem) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1666 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 100 +++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 48 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 2b2dcbdf..4ce8c88b 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -320,7 +320,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-BodoWartke-LoveSong.zip" @@ -347,7 +347,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + ZipDLL::extractall "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" Delete "$TEMP\Song-I-18.zip" @@ -374,7 +374,7 @@ Section /o "Monkey Shines" s2_sub1_Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-MS.zip" @@ -395,7 +395,7 @@ Section /o "I Crush Everything" s2_sub1_Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-ICE.zip" @@ -416,7 +416,7 @@ Section /o "Not About You" s2_sub1_Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-NAY.zip" @@ -438,7 +438,7 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-MFP.zip" @@ -459,7 +459,7 @@ Section /o "Big Bad World One" s2_sub1_Section5 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-BBWO.zip" @@ -480,7 +480,7 @@ Section /o "Flickr" s2_sub1_Section6 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-Flickr.zip" @@ -501,7 +501,7 @@ Section /o "My Beige Bear" s2_sub1_Section7 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-MBB.zip" @@ -522,7 +522,7 @@ Section /o "The Future Soon" s2_sub1_Section8 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-TFS.zip" @@ -543,7 +543,7 @@ Section /o "Ikea" s2_sub1_Section9 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-Ikea.zip" @@ -564,7 +564,7 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-FOL.zip" @@ -585,7 +585,7 @@ Section /o "Code Monkey" s2_sub1_Section11 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-CM.zip" @@ -606,7 +606,7 @@ Section /o "I StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-IYM.zip" @@ -627,7 +627,7 @@ Section /o "First Of May" s2_sub1_Section13 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-FOM.zip" @@ -648,7 +648,7 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-DSJD.zip" @@ -669,7 +669,7 @@ Section /o "A Walk With George" s2_sub1_Section15 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-AWWG.zip" @@ -690,7 +690,7 @@ Section /o "Creepy Doll" s2_sub1_Section16 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-CD.zip" @@ -711,7 +711,7 @@ Section /o "That Spells DNA" s2_sub1_Section17 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-TSDNA.zip" @@ -732,7 +732,7 @@ Section /o "When You Go" s2_sub1_Section18 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-WYG.zip" @@ -753,7 +753,7 @@ Section /o "Better" s2_sub1_Section19 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-Better.zip" @@ -774,7 +774,7 @@ Section /o "Shop Vac" s2_sub1_Section20 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-SV.zip" @@ -795,7 +795,7 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-IFF.zip" @@ -816,7 +816,7 @@ Section /o "Re: Your Brains" s2_sub1_Section22 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-ReYB.zip" @@ -837,7 +837,7 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-SCM.zip" @@ -858,7 +858,7 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-JC-CBP.zip" @@ -887,7 +887,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" + ZipDLL::extractall "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" Delete "$TEMP\Song-On-the-run.zip" @@ -909,7 +909,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" + ZipDLL::extractall "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" Delete "$TEMP\Song-Space-Invaders.zip" @@ -932,7 +932,7 @@ Section /o "Shearer - 69" s2_sub2_Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-69.zip" @@ -953,7 +953,7 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-69-Kar.zip" @@ -974,7 +974,7 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-CSI.zip" @@ -995,7 +995,7 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-CSI-Kar.zip" @@ -1016,7 +1016,7 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-IMH.zip" @@ -1037,7 +1037,7 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-MS.zip" @@ -1058,7 +1058,7 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-MS-Kar.zip" @@ -1079,7 +1079,7 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-SWM.zip" @@ -1100,7 +1100,8 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" + + ZipDLL::extractall "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-Shearer-SWM-Kar.zip" @@ -1124,7 +1125,8 @@ Section /o "Steven Dunston - Northern Star" g2Section5 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" + + ZipDLL::extractall "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" Delete "$TEMP\Song-Northern-Star.zip" @@ -1134,7 +1136,7 @@ SectionEnd SectionGroup $(name_s2_sub3) s2_sub3 -Section /o "Wise Guys - Lebendig und kraeftig und schaerfer" s2_sub3_Section1 +Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 ; AddSize 1400 SetOverwrite try @@ -1147,7 +1149,8 @@ Section /o "Wise Guys - Lebendig und kraeftig und schaerfer" s2_sub3_Section1 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" + + ZipDLL::extractall "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-WiseGuys-LUKUS.zip" @@ -1168,7 +1171,8 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" + + ZipDLL::extractall "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" Delete "$TEMP\Song-WiseGuys-MWBD.zip" @@ -1196,7 +1200,7 @@ SectionGroup $(name_section3) Section3 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-Orange.zip" "$INSTDIR\" Delete "$TEMP\Theme-Orange.zip" @@ -1214,7 +1218,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" Delete "$TEMP\Theme-Streetlight.zip" @@ -1233,7 +1237,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-Vistar.zip" "$INSTDIR\" Delete "$TEMP\Theme-Vistar.zip" @@ -1252,7 +1256,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" Delete "$TEMP\Theme-BlueSensation.zip" @@ -1272,7 +1276,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" Delete "$TEMP\Theme-WhiteSensation.zip" @@ -1291,7 +1295,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" Delete "$TEMP\Theme-WiiStar.zip" @@ -1310,7 +1314,7 @@ SectionEnd StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - nsisunz::Unzip "$TEMP\Theme-iStar.zip" "$INSTDIR\" + ZipDLL::extractall "$TEMP\Theme-iStar.zip" "$INSTDIR\" Delete "$TEMP\Theme-iStar.zip" -- cgit v1.2.3 From e05652b4e123eb241cb3c9b85e1b89796996b196 Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 12 Apr 2009 18:56:27 +0000 Subject: - added uninstall option (songs, covers, highscores) - added section sizes - changed default options git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1667 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 164 ++++++++++++++++++++++++++++------------- 1 file changed, 112 insertions(+), 52 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 4ce8c88b..2b2991e3 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -6,6 +6,7 @@ !include WinVer.nsh !include LogicLib.nsh !include InstallOptions.nsh +!include nsDialogs.nsh ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Variables @@ -82,6 +83,7 @@ RequestExecutionLevel user !define MUI_WELCOMEPAGE_TITLE_3LINES !define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)" + !define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)" ; License Page: @@ -148,6 +150,9 @@ Function Settings ; Get all the variables: +Var /GLOBAL CHECKBOX +Var /GLOBAL checkbox_state + var /GLOBAL fullscreen var /GLOBAL language2 var /GLOBAL resolution @@ -192,18 +197,35 @@ ${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini" ${EndIf} -${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini" ; Animations On / Off Tasks ${If} $animations == "Off" +${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" + ${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini" ${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini" ${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" + +${EndIf} + +${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini" + +${If} $animations != "Off" + +${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" + +${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" + ${EndIf} @@ -216,8 +238,46 @@ FunctionEnd ; Settings page End ; Pages UnInstallation Routine ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +!define MUI_WELCOMEPAGE_TITLE "$(page_un_welcome_title)" !insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_CONFIRM + +UninstPage custom un.AskDelete un.DeleteAll + +Function un.AskDelete + +nsDialogs::Create /NOUNLOAD 1018 + + ${NSD_CreateCheckbox} 0 -150 100% 8u "$(delete_all)" + Pop $CHECKBOX + + nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 + + +nsDialogs::Show + +FunctionEnd + +Function un.DeleteAll + +${NSD_GetState} $CHECKBOX $checkbox_state + +${If} $checkbox_state == "1" + + RMDir /r "$INSTDIR\Songs" + RMDir /r "$INSTDIR\Covers" + Delete "$INSTDIR\Ultrastar.db" + +${Else} + +; If checkbox_state = 0 + + +${EndIf} + + +FunctionEnd + !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH @@ -309,7 +369,7 @@ SectionGroup $(name_section2) Section2 Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 -; AddSize 1400 + AddSize 10342 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -334,7 +394,7 @@ SectionEnd ; Section /o "Dead Smiling Pirates - I 18" g2Section2 -; AddSize 1400 + AddSize 2816 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18" @@ -363,7 +423,7 @@ SectionGroup $(name_s2_sub1) s2_sub1 Section /o "Monkey Shines" s2_sub1_Section1 -; AddSize 1400 + AddSize 1455 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -384,7 +444,7 @@ SectionEnd Section /o "I Crush Everything" s2_sub1_Section2 -; AddSize 1400 + AddSize 7127 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -405,7 +465,7 @@ SectionEnd Section /o "Not About You" s2_sub1_Section3 -; AddSize 1400 + AddSize 3492 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -427,7 +487,7 @@ SectionEnd Section /o "Mr. Fancy Pants" s2_sub1_Section4 -; AddSize 1400 + AddSize 2427 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -448,7 +508,7 @@ SectionEnd Section /o "Big Bad World One" s2_sub1_Section5 -; AddSize 1400 + AddSize 4424 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -469,7 +529,7 @@ SectionEnd Section /o "Flickr" s2_sub1_Section6 -; AddSize 1400 + AddSize 21607 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -490,7 +550,7 @@ SectionEnd Section /o "My Beige Bear" s2_sub1_Section7 -; AddSize 1400 + AddSize 4926 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -511,7 +571,7 @@ SectionEnd Section /o "The Future Soon" s2_sub1_Section8 -; AddSize 1400 + AddSize 5612 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -532,7 +592,7 @@ SectionEnd Section /o "Ikea" s2_sub1_Section9 -; AddSize 1400 + AddSize 4608 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -553,7 +613,7 @@ SectionEnd Section /o "Furry Old Lobster" s2_sub1_Section10 -; AddSize 1400 + AddSize 3288 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -574,7 +634,7 @@ SectionEnd Section /o "Code Monkey" s2_sub1_Section11 -; AddSize 1400 + AddSize 21402 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -595,7 +655,7 @@ SectionEnd Section /o "I´m Your Moon" s2_sub1_Section12 -; AddSize 1400 + AddSize 4916 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -616,7 +676,7 @@ SectionEnd Section /o "First Of May" s2_sub1_Section13 -; AddSize 1400 + AddSize 6257 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -637,7 +697,7 @@ SectionEnd Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 -; AddSize 1400 + AddSize 5929 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -656,22 +716,22 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 SectionEnd -Section /o "A Walk With George" s2_sub1_Section15 +Section /o "A Talk With George" s2_sub1_Section15 -; AddSize 1400 + AddSize 4076 SetOverwrite try SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-AWWG.zip + NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-AWWG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\" - Delete "$TEMP\Song-JC-AWWG.zip" + Delete "$TEMP\Song-JC-ATWG.zip" SetOutPath "$INSTDIR" @@ -679,7 +739,7 @@ SectionEnd Section /o "Creepy Doll" s2_sub1_Section16 -; AddSize 1400 + AddSize 66560 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -700,7 +760,7 @@ SectionEnd Section /o "That Spells DNA" s2_sub1_Section17 -; AddSize 1400 + AddSize 4158 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -721,7 +781,7 @@ SectionEnd Section /o "When You Go" s2_sub1_Section18 -; AddSize 1400 + AddSize 5755 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -742,7 +802,7 @@ SectionEnd Section /o "Better" s2_sub1_Section19 -; AddSize 1400 + AddSize 4199 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -763,7 +823,7 @@ SectionEnd Section /o "Shop Vac" s2_sub1_Section20 -; AddSize 1400 + AddSize 5448 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -784,7 +844,7 @@ SectionEnd Section /o "I Feel Fantastic" s2_sub1_Section21 -; AddSize 1400 + AddSize 3851 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -805,7 +865,7 @@ SectionEnd Section /o "Re: Your Brains" s2_sub1_Section22 -; AddSize 1400 + AddSize 7087 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -826,7 +886,7 @@ SectionEnd Section /o "Skullcrusher Mountain" s2_sub1_Section23 -; AddSize 1400 + AddSize 6298 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -847,7 +907,7 @@ SectionEnd Section /o "Chiron Beta Prime" s2_sub1_Section24 -; AddSize 1400 + AddSize 38298 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -874,7 +934,7 @@ SectionGroupEnd ; Section /o "Joshua Morin - On The Run" g2Section3 -; AddSize 2200 + AddSize 3881 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run" @@ -896,7 +956,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 SectionEnd Section /o "Pornophonique - Space Invaders" g2Section4 -; AddSize 2200 + AddSize 3646 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders" @@ -921,7 +981,7 @@ SectionGroup $(name_s2_sub2) s2_sub2 Section /o "Shearer - 69" s2_sub2_Section1 -; AddSize 1400 + AddSize 4557 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -942,7 +1002,7 @@ SectionEnd Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 -; AddSize 1400 + AddSize 4772 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -963,7 +1023,7 @@ SectionEnd Section /o "Shearer - Can't stop it" s2_sub2_Section3 -; AddSize 1400 + AddSize 5510 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -984,7 +1044,7 @@ SectionEnd Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 -; AddSize 1400 + AddSize 4178 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1005,7 +1065,7 @@ SectionEnd Section /o "Shearer - In My Hand" s2_sub2_Section5 -; AddSize 1400 + AddSize 5960 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1026,7 +1086,7 @@ SectionEnd Section /o "Shearer - Man Song" s2_sub2_Section6 -; AddSize 1400 + AddSize 7270 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1047,7 +1107,7 @@ SectionEnd Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 -; AddSize 1400 + AddSize 5807 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1068,7 +1128,7 @@ SectionEnd Section /o "Shearer - Stay With Me" s2_sub2_Section8 -; AddSize 1400 + AddSize 6400 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1089,7 +1149,7 @@ SectionEnd Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 -; AddSize 1400 + AddSize 5417 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1112,7 +1172,7 @@ SectionEnd SectionGroupEnd Section /o "Steven Dunston - Northern Star" g2Section5 -; AddSize 1500 + AddSize 2427 SetOverwrite try SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star" @@ -1138,7 +1198,7 @@ SectionGroup $(name_s2_sub3) s2_sub3 Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 -; AddSize 1400 + AddSize 4015 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1160,7 +1220,7 @@ SectionEnd Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 -; AddSize 1400 + AddSize 5335 SetOverwrite try SetOutPath "$INSTDIR\Songs\" @@ -1191,7 +1251,7 @@ SectionGroupEnd SectionGroup $(name_section3) Section3 Section /o "Orange" g3Section1 -; AddSize 700 + AddSize 1291 ; Download theme orange: NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip @@ -1209,7 +1269,7 @@ SectionGroup $(name_section3) Section3 SectionEnd Section /o "Streetlight" g3Section2 -; AddSize 1000 + AddSize 1905 ; Download theme Streetlight: NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip @@ -1227,7 +1287,7 @@ SectionEnd SectionEnd Section /o "Vistar" g3Section3 -; AddSize 1000 + AddSize 1936 ; Download theme Vistar: @@ -1246,7 +1306,7 @@ SectionEnd SectionEnd Section /o "BlueSensation" g3Section4 -; AddSize 1000 + AddSize 2109 ; Download theme BlueSensation: @@ -1266,7 +1326,7 @@ SectionEnd Section /o "WhiteSensation" g3Section5 -; AddSize 1000 + AddSize 1168 ; Download theme WhiteSensation: @@ -1285,7 +1345,7 @@ SectionEnd SectionEnd Section /o "WiiStar" g3Section6 -; AddSize 1000 + AddSize 850 ; Download theme WiiStar: @@ -1304,7 +1364,7 @@ SectionEnd SectionEnd Section /o "iStar" g3Section7 -; AddSize 1000 + AddSize 1588 ; Download theme iStar: -- cgit v1.2.3 From c52a15b5fbd7df575d20e1387a435be4873ec6e1 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 24 Apr 2009 18:47:21 +0000 Subject: - fixed problems with UAC on Windows Vista and upcoming Windows 7 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1693 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 2b2991e3..07b064ba 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -43,9 +43,9 @@ OutFile "ultrastardx-${version}-installer-full.exe" InstallDir "$PROGRAMFILES\${name}" -; Windows Vista: +; Windows Vista / Windows 7: -RequestExecutionLevel user +RequestExecutionLevel admin ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Interface Settings -- cgit v1.2.3 From 81bd09278aeffe40bf73e3ee4c6613cbeada6859 Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 25 Apr 2009 16:05:33 +0000 Subject: - updated portugese (thx to zup3r_vock) and croation language - changed installer timeouts git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1696 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 94 +++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 07b064ba..a6f37e2a 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -374,7 +374,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip + NSISdl::download /TIMEOUT=50000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip Pop $R0 StrCmp $R0 "success" dlok @@ -401,7 +401,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-I-18.zip + NSISdl::download /TIMEOUT=50000 ${download_song2} $TEMP\Song-I-18.zip Pop $R0 StrCmp $R0 "success" dlok @@ -428,7 +428,7 @@ Section /o "Monkey Shines" s2_sub1_Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -449,7 +449,7 @@ Section /o "I Crush Everything" s2_sub1_Section2 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip Pop $R0 StrCmp $R0 "success" dlok @@ -470,7 +470,7 @@ Section /o "Not About You" s2_sub1_Section3 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip Pop $R0 StrCmp $R0 "success" dlok @@ -492,7 +492,7 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip Pop $R0 StrCmp $R0 "success" dlok @@ -513,7 +513,7 @@ Section /o "Big Bad World One" s2_sub1_Section5 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip Pop $R0 StrCmp $R0 "success" dlok @@ -534,7 +534,7 @@ Section /o "Flickr" s2_sub1_Section6 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip Pop $R0 StrCmp $R0 "success" dlok @@ -555,7 +555,7 @@ Section /o "My Beige Bear" s2_sub1_Section7 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip Pop $R0 StrCmp $R0 "success" dlok @@ -576,7 +576,7 @@ Section /o "The Future Soon" s2_sub1_Section8 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -597,7 +597,7 @@ Section /o "Ikea" s2_sub1_Section9 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip Pop $R0 StrCmp $R0 "success" dlok @@ -618,7 +618,7 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip Pop $R0 StrCmp $R0 "success" dlok @@ -639,7 +639,7 @@ Section /o "Code Monkey" s2_sub1_Section11 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -660,7 +660,7 @@ Section /o "I SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -681,7 +681,7 @@ Section /o "First Of May" s2_sub1_Section13 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -702,7 +702,7 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip Pop $R0 StrCmp $R0 "success" dlok @@ -723,7 +723,7 @@ Section /o "A Talk With George" s2_sub1_Section15 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip Pop $R0 StrCmp $R0 "success" dlok @@ -744,7 +744,7 @@ Section /o "Creepy Doll" s2_sub1_Section16 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip Pop $R0 StrCmp $R0 "success" dlok @@ -765,7 +765,7 @@ Section /o "That Spells DNA" s2_sub1_Section17 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip Pop $R0 StrCmp $R0 "success" dlok @@ -786,7 +786,7 @@ Section /o "When You Go" s2_sub1_Section18 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip Pop $R0 StrCmp $R0 "success" dlok @@ -807,7 +807,7 @@ Section /o "Better" s2_sub1_Section19 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip Pop $R0 StrCmp $R0 "success" dlok @@ -828,7 +828,7 @@ Section /o "Shop Vac" s2_sub1_Section20 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip Pop $R0 StrCmp $R0 "success" dlok @@ -849,7 +849,7 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip Pop $R0 StrCmp $R0 "success" dlok @@ -870,7 +870,7 @@ Section /o "Re: Your Brains" s2_sub1_Section22 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip Pop $R0 StrCmp $R0 "success" dlok @@ -891,7 +891,7 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -912,7 +912,7 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip Pop $R0 StrCmp $R0 "success" dlok @@ -941,7 +941,7 @@ Section /o "Joshua Morin - On The Run" g2Section3 SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -963,7 +963,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4 SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Space-Invaders.zip + NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -986,7 +986,7 @@ Section /o "Shearer - 69" s2_sub2_Section1 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1007,7 +1007,7 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1028,7 +1028,7 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1049,7 +1049,7 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1070,7 +1070,7 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1091,7 +1091,7 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1112,7 +1112,7 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1133,7 +1133,7 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1154,7 +1154,7 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1179,7 +1179,7 @@ Section /o "Steven Dunston - Northern Star" g2Section5 SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1203,7 +1203,7 @@ Section /o "Wise Guys - Lebendig und kr SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1225,7 +1225,7 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 SetOutPath "$INSTDIR\Songs\" ; Download song: - NSISdl::download /TIMEOUT=30000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip Pop $R0 StrCmp $R0 "success" dlok @@ -1254,7 +1254,7 @@ SectionGroup $(name_section3) Section3 AddSize 1291 ; Download theme orange: - NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip + NSISdl::download /TIMEOUT=50000 ${download_theme1} $TEMP\Theme-Orange.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1272,7 +1272,7 @@ SectionEnd AddSize 1905 ; Download theme Streetlight: - NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip + NSISdl::download /TIMEOUT=50000 ${download_theme2} $TEMP\Theme-Streetlight.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1291,7 +1291,7 @@ SectionEnd ; Download theme Vistar: - NSISdl::download /TIMEOUT=30000 ${download_theme3} $TEMP\Theme-Vistar.zip + NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1310,7 +1310,7 @@ SectionEnd ; Download theme BlueSensation: - NSISdl::download /TIMEOUT=30000 ${download_theme4} $TEMP\Theme-BlueSensation.zip + NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1330,7 +1330,7 @@ SectionEnd ; Download theme WhiteSensation: - NSISdl::download /TIMEOUT=30000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip + NSISdl::download /TIMEOUT=50000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1349,7 +1349,7 @@ SectionEnd ; Download theme WiiStar: - NSISdl::download /TIMEOUT=30000 ${download_theme5} $TEMP\Theme-WiiStar.zip + NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok @@ -1368,7 +1368,7 @@ SectionEnd ; Download theme iStar: - NSISdl::download /TIMEOUT=30000 ${download_theme6} $TEMP\Theme-iStar.zip + NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok -- cgit v1.2.3 From edf4235745e5074a946f8552ec246b3b7c6f3bb6 Mon Sep 17 00:00:00 2001 From: canni0 Date: Mon, 12 Apr 2010 01:03:25 +0000 Subject: updated installer source: - adjusted folders to fit with changes from 1.1 alpha - removed incompatible themes - removed vista game exoplorer features due to incompatibility with windows 7 - added background music derivated from bebeto - added another song - fixed small icons bug - merged dependencies folder into installer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2227 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 663 ++++++++++++++++------------------------- 1 file changed, 258 insertions(+), 405 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index a6f37e2a..28d1400e 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -16,14 +16,13 @@ !define path_settings ".\settings" !define path_languages ".\languages" -!define path_images "..\installerdependencies\images" -!define path_plugins "..\installerdependencies\plugins" -!define path_gdf "$WINDIR\gdf.dll" +!define path_dependencies ".\dependencies" +!define path_images ".\dependencies\images" +!define path_plugins ".\dependencies\plugins" !addPluginDir "${path_plugins}\" !include "${path_settings}\variables.nsh" -!include "${path_settings}\GameExplorer.nsh" !include "${path_settings}\functions.nsh" ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -31,10 +30,12 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ SetCompress Auto -SetCompressor /SOLID lzma +SetCompressor lzma SetCompressorDictSize 32 SetDatablockOptimize On +CRCCheck on + XPStyle on Name "${name} v.${version}" @@ -42,6 +43,7 @@ Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe" InstallDir "$PROGRAMFILES\${name}" +InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\UltraStar Deluxe" "InstallDir" ; Windows Vista / Windows 7: @@ -53,8 +55,8 @@ RequestExecutionLevel admin ; Icons: -!define MUI_ICON "${path_images}\${img_install}" -!define MUI_UNICON "${path_images}\${img_uninstall}" +!define MUI_ICON "${img_install}" +!define MUI_UNICON "${img_uninstall}" ; Header and Side Images: @@ -79,6 +81,8 @@ RequestExecutionLevel admin ; Pages Installation Routine Settings ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ +!define MUI_CUSTOMFUNCTION_GUIINIT bgmusic + ; Welcome Page: !define MUI_WELCOMEPAGE_TITLE_3LINES @@ -133,7 +137,7 @@ var ICONS_GROUP !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}" !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${name}" !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP !insertmacro MUI_PAGE_INSTFILES @@ -167,71 +171,45 @@ var /GLOBAL animations ; Write all variables to config.ini -FileOpen $0 '$INSTDIR\config.ini' w -FileWrite $0 '[Game]$\r$\n' -FileClose $0 - -${If} $language2 != "" - -${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini" - -${EndIf} - -${If} $tabs != "" - -${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini" - -${EndIf} - -${WriteToConfig} "[Graphics]$\r$\n" "$INSTDIR\config.ini" - -${If} $fullscreen != "" - -${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini" +var /GLOBAL path_config +var /GLOBAL path_configini +${If} ${AtLeastWinVista} + SetShellVarContext current + StrCpy $path_config "$APPDATA\ultrastardx" + SetShellVarContext all +${Else} + StrCpy $path_config "$INSTDIR" ${EndIf} -${If} $resolution != "" +StrCpy $path_configini "$path_config\config.ini" -${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "[Game]$\r$\n" "$path_configini" +${WriteToConfig} "Language=$language2$\r$\n" "$path_configini" +${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini" -${EndIf} +${WriteToConfig} "[Graphics]$\r$\n" "$path_configini" +${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini" +${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini" -${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini" -${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini" +${WriteToConfig} "[Sound]$\r$\n" "$path_configini" +${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$path_configini" ; Animations On / Off Tasks ${If} $animations == "Off" - -${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" - -${EndIf} - -${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini" -${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini" -${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini" - -${If} $animations != "Off" - -${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini" - -${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini" - +${WriteToConfig} "[Advanced]$\r$\n" "$path_configini" +${WriteToConfig} "LoadAnimation=Off$\r$\n" "$path_configini" +${WriteToConfig} "EffectSing=Off$\r$\n" "$path_configini" +${WriteToConfig} "ScreenFade=Off$\r$\n" "$path_configini" ${EndIf} +${WriteToConfig} "[Lyrics]$\r$\n" "$path_configini" +${WriteToConfig} "LyricsFont=Plain$\r$\n" "$path_configini" +${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$path_configini" FunctionEnd ; Settings page End - !insertmacro MUI_PAGE_FINISH ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ @@ -264,10 +242,20 @@ ${NSD_GetState} $CHECKBOX $checkbox_state ${If} $checkbox_state == "1" - RMDir /r "$INSTDIR\Songs" - RMDir /r "$INSTDIR\Covers" +; Remove settings, songs, highscores, covers + + RMDir /r "$INSTDIR\songs" + RMDir /r "$INSTDIR\covers" + Delete "$INSTDIR\config.ini" Delete "$INSTDIR\Ultrastar.db" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\songs" + RMDir /r "$APPDATA\ultrastardx\covers" + Delete "$APPDATA\ultrastardx\config.ini" + Delete "$APPDATA\ultrastardx\Ultrastar.db" + SetShellVarContext all + ${Else} ; If checkbox_state = 0 @@ -302,56 +290,27 @@ Section $(name_section1) Section1 SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetShellVarContext all SetOutPath "$INSTDIR" CreateDirectory "${name}" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" -; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_license).lnk" "$INSTDIR\License.txt" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" - !insertmacro MUI_STARTMENU_WRITE_END +!insertmacro MUI_STARTMENU_WRITE_END ; Vista Game Explorer: - -${If} ${AtLeastWinVista} - -${GameExplorer_GenerateGUID} -Pop $0 - -${GameExplorer_AddGame} all "${path_gdf}" $WINDIR $INSTDIR\${exe}.exe $0 - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \ - "$INSTDIR\${exe}.exe" "-Benchmark" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \ - "$INSTDIR\${exe}.exe" "-Joypad" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \ - "$INSTDIR\${exe}.exe" "-FullScreen" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \ - "$INSTDIR\${exe}.exe" "-Screens 2" - -CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0 -CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \ - "http://forum.ultrastardeluxe.org" - -${EndIf} +; (removed due to incompatibility with Windows 7, needs rewrite) ; Create Uninstaller: WriteUninstaller "$INSTDIR\Uninstall.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" @@ -371,18 +330,18 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 AddSize 10342 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip + NSISdl::download /TIMEOUT=50000 ${download_song1} $LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-BodoWartke-LoveSong.zip" + Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" SetOutPath "$INSTDIR" @@ -397,19 +356,19 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 AddSize 2816 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18" - SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18" + SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song2} $TEMP\Song-I-18.zip + NSISdl::download /TIMEOUT=50000 ${download_song2} $LOCALAPPDATA\Temp\Song-I-18.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\" - Delete "$TEMP\Song-I-18.zip" + Delete "$LOCALAPPDATA\Temp\Song-I-18.zip" SetOutPath "$INSTDIR" @@ -425,18 +384,18 @@ Section /o "Monkey Shines" s2_sub1_Section1 AddSize 1455 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $LOCALAPPDATA\Temp\Song-JC-MS.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-MS.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip" SetOutPath "$INSTDIR" @@ -446,18 +405,18 @@ Section /o "I Crush Everything" s2_sub1_Section2 AddSize 7127 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $LOCALAPPDATA\Temp\Song-JC-ICE.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-ICE.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" SetOutPath "$INSTDIR" @@ -467,18 +426,18 @@ Section /o "Not About You" s2_sub1_Section3 AddSize 3492 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $LOCALAPPDATA\Temp\Song-JC-NAY.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-NAY.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" SetOutPath "$INSTDIR" @@ -489,18 +448,18 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 AddSize 2427 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $LOCALAPPDATA\Temp\Song-JC-MFP.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-MFP.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" SetOutPath "$INSTDIR" @@ -510,18 +469,18 @@ Section /o "Big Bad World One" s2_sub1_Section5 AddSize 4424 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $LOCALAPPDATA\Temp\Song-JC-BBWO.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-BBWO.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" SetOutPath "$INSTDIR" @@ -531,18 +490,18 @@ Section /o "Flickr" s2_sub1_Section6 AddSize 21607 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $LOCALAPPDATA\Temp\Song-JC-Flickr.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-Flickr.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" SetOutPath "$INSTDIR" @@ -552,18 +511,18 @@ Section /o "My Beige Bear" s2_sub1_Section7 AddSize 4926 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $LOCALAPPDATA\Temp\Song-JC-MBB.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-MBB.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" SetOutPath "$INSTDIR" @@ -573,18 +532,18 @@ Section /o "The Future Soon" s2_sub1_Section8 AddSize 5612 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $LOCALAPPDATA\Temp\Song-JC-TFS.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-TFS.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" SetOutPath "$INSTDIR" @@ -594,18 +553,18 @@ Section /o "Ikea" s2_sub1_Section9 AddSize 4608 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $LOCALAPPDATA\Temp\Song-JC-Ikea.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-Ikea.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" SetOutPath "$INSTDIR" @@ -615,18 +574,18 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 AddSize 3288 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $LOCALAPPDATA\Temp\Song-JC-FOL.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-FOL.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" SetOutPath "$INSTDIR" @@ -636,18 +595,18 @@ Section /o "Code Monkey" s2_sub1_Section11 AddSize 21402 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $LOCALAPPDATA\Temp\Song-JC-CM.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-CM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip" SetOutPath "$INSTDIR" @@ -657,18 +616,18 @@ Section /o "I AddSize 4916 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $LOCALAPPDATA\Temp\Song-JC-IYM.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-IYM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" SetOutPath "$INSTDIR" @@ -678,18 +637,18 @@ Section /o "First Of May" s2_sub1_Section13 AddSize 6257 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $LOCALAPPDATA\Temp\Song-JC-FOM.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-FOM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" SetOutPath "$INSTDIR" @@ -699,18 +658,18 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 AddSize 5929 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $LOCALAPPDATA\Temp\Song-JC-DSJD.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-DSJD.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" SetOutPath "$INSTDIR" @@ -720,18 +679,18 @@ Section /o "A Talk With George" s2_sub1_Section15 AddSize 4076 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $LOCALAPPDATA\Temp\Song-JC-ATWG.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-ATWG.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" SetOutPath "$INSTDIR" @@ -741,18 +700,18 @@ Section /o "Creepy Doll" s2_sub1_Section16 AddSize 66560 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $LOCALAPPDATA\Temp\Song-JC-CD.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-CD.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip" SetOutPath "$INSTDIR" @@ -762,18 +721,18 @@ Section /o "That Spells DNA" s2_sub1_Section17 AddSize 4158 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $LOCALAPPDATA\Temp\Song-JC-TSDNA.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-TSDNA.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" SetOutPath "$INSTDIR" @@ -783,18 +742,18 @@ Section /o "When You Go" s2_sub1_Section18 AddSize 5755 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $LOCALAPPDATA\Temp\Song-JC-WYG.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-WYG.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" SetOutPath "$INSTDIR" @@ -804,18 +763,18 @@ Section /o "Better" s2_sub1_Section19 AddSize 4199 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $LOCALAPPDATA\Temp\Song-JC-Better.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-Better.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip" SetOutPath "$INSTDIR" @@ -825,18 +784,18 @@ Section /o "Shop Vac" s2_sub1_Section20 AddSize 5448 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $LOCALAPPDATA\Temp\Song-JC-SV.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-SV.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip" SetOutPath "$INSTDIR" @@ -846,18 +805,18 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 AddSize 3851 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $LOCALAPPDATA\Temp\Song-JC-IFF.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-IFF.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" SetOutPath "$INSTDIR" @@ -867,18 +826,18 @@ Section /o "Re: Your Brains" s2_sub1_Section22 AddSize 7087 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $LOCALAPPDATA\Temp\Song-JC-ReYB.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-ReYB.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" SetOutPath "$INSTDIR" @@ -888,18 +847,18 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 AddSize 6298 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $LOCALAPPDATA\Temp\Song-JC-SCM.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-SCM.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" SetOutPath "$INSTDIR" @@ -909,18 +868,18 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 AddSize 38298 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip + NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $LOCALAPPDATA\Temp\Song-JC-CBP.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-JC-CBP.zip" + Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" SetOutPath "$INSTDIR" @@ -937,19 +896,19 @@ Section /o "Joshua Morin - On The Run" g2Section3 AddSize 3881 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run" - SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\" + CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run" + SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip + NSISdl::download /TIMEOUT=50000 ${download_song3} $LOCALAPPDATA\Temp\Song-On-the-run.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\" - Delete "$TEMP\Song-On-the-run.zip" + Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip" SetOutPath "$INSTDIR" @@ -959,19 +918,19 @@ Section /o "Pornophonique - Space Invaders" g2Section4 AddSize 3646 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders" - SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\" + CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders" + SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip + NSISdl::download /TIMEOUT=50000 ${download_song4} $LOCALAPPDATA\Temp\Song-Space-Invaders.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\" - Delete "$TEMP\Song-Space-Invaders.zip" + Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" SetOutPath "$INSTDIR" @@ -983,18 +942,18 @@ Section /o "Shearer - 69" s2_sub2_Section1 AddSize 4557 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $LOCALAPPDATA\Temp\Song-Shearer-69.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-69.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" SetOutPath "$INSTDIR" @@ -1004,18 +963,18 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 AddSize 4772 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-69-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" SetOutPath "$INSTDIR" @@ -1025,18 +984,18 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 AddSize 5510 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $LOCALAPPDATA\Temp\Song-Shearer-CSI.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-CSI.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" SetOutPath "$INSTDIR" @@ -1046,18 +1005,18 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 AddSize 4178 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-CSI-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" SetOutPath "$INSTDIR" @@ -1067,18 +1026,18 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 AddSize 5960 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $LOCALAPPDATA\Temp\Song-Shearer-IMH.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-IMH.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" SetOutPath "$INSTDIR" @@ -1088,18 +1047,18 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 AddSize 7270 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $LOCALAPPDATA\Temp\Song-Shearer-MS.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-MS.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" SetOutPath "$INSTDIR" @@ -1109,18 +1068,18 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 AddSize 5807 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-MS-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" SetOutPath "$INSTDIR" @@ -1130,18 +1089,18 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 AddSize 6400 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $LOCALAPPDATA\Temp\Song-Shearer-SWM.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-SWM.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" SetOutPath "$INSTDIR" @@ -1151,19 +1110,19 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 AddSize 5417 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip + NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-Shearer-SWM-Kar.zip" + Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" SetOutPath "$INSTDIR" @@ -1175,20 +1134,20 @@ Section /o "Steven Dunston - Northern Star" g2Section5 AddSize 2427 SetOverwrite try SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star" - SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\" + CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star" + SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip + NSISdl::download /TIMEOUT=50000 ${download_song5} $LOCALAPPDATA\Temp\Song-Northern-Star.zip Pop $R0 ;Get the return value StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\" - Delete "$TEMP\Song-Northern-Star.zip" + Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" SetOutPath "$INSTDIR" @@ -1200,19 +1159,19 @@ Section /o "Wise Guys - Lebendig und kr AddSize 4015 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip + NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-WiseGuys-LUKUS.zip" + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" SetOutPath "$INSTDIR" @@ -1222,167 +1181,56 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 AddSize 5335 SetOverwrite try - SetOutPath "$INSTDIR\Songs\" + SetOutPath "$INSTDIR\songs\" ; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip + NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\" + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\" - Delete "$TEMP\Song-WiseGuys-MWBD.zip" + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" SetOutPath "$INSTDIR" SectionEnd -SectionGroupEnd - -SectionGroupEnd - -;------------------------------------ -; OPTIONAL THEMES (Section 3) -;------------------------------------ - -SectionGroup $(name_section3) Section3 +Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3 - Section /o "Orange" g3Section1 - AddSize 1291 - -; Download theme orange: - NSISdl::download /TIMEOUT=50000 ${download_theme1} $TEMP\Theme-Orange.zip + AddSize 5335 + SetOverwrite try + SetOutPath "$INSTDIR\songs\" - Pop $R0 ;Get the return value +; Download song: + NSISdl::download /TIMEOUT=50000 ${download_sub3_song3} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip + + Pop $R0 StrCmp $R0 "success" dlok MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK dlok: - ZipDLL::extractall "$TEMP\Theme-Orange.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-Orange.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "Streetlight" g3Section2 - AddSize 1905 -; Download theme Streetlight: - NSISdl::download /TIMEOUT=50000 ${download_theme2} $TEMP\Theme-Streetlight.zip + ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\" - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-Streetlight.zip" + Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" SetOutPath "$INSTDIR" SectionEnd - Section /o "Vistar" g3Section3 - AddSize 1936 - -; Download theme Vistar: - - NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$TEMP\Theme-Vistar.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-Vistar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "BlueSensation" g3Section4 - AddSize 2109 - -; Download theme BlueSensation: - - NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-BlueSensation.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - - Section /o "WhiteSensation" g3Section5 - AddSize 1168 - -; Download theme WhiteSensation: - - NSISdl::download /TIMEOUT=50000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-WhiteSensation.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "WiiStar" g3Section6 - AddSize 850 - -; Download theme WiiStar: - - NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$TEMP\Theme-WiiStar.zip" "$INSTDIR\" - - Delete "$TEMP\Theme-WiiStar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - Section /o "iStar" g3Section7 - AddSize 1588 - -; Download theme iStar: - - NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$TEMP\Theme-iStar.zip" "$INSTDIR\" +SectionGroupEnd - Delete "$TEMP\Theme-iStar.zip" +SectionGroupEnd - SetOutPath "$INSTDIR" +;------------------------------------ +; OPTIONAL THEMES (Section 3) +;------------------------------------ -SectionEnd - -SectionGroupEnd +; No additional themes available +; for current version of ultrastardx ;------------------------------------ ; UNINSTALL (Section 4) @@ -1397,14 +1245,7 @@ Section Uninstall DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" ; Unregister from Windows Vista Game Explorer - -${If} ${AtLeastWinVista} - -${GameExplorer_RemoveGame} $0 - -${EndIf} - - +; (removed due to incompatibility with Windows 7) SectionEnd @@ -1420,7 +1261,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) - !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) +; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) @@ -1465,14 +1306,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) - - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6) - !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3) !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -1487,10 +1321,21 @@ SectionEnd !include "${path_languages}\*.nsh" +;!addPluginDir "${path_plugins}\" + +Function bgmusic + File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav + BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav +FunctionEnd + +Function .onGUIEnd + BGImage::Sound /STOP +FunctionEnd + Function .onInit var /GLOBAL version -StrCpy $version "1.1a" +StrCpy $version "1.1beta" System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' @@ -1537,10 +1382,18 @@ Function un.onInit StrCmp $R0 0 0 +2 MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end - closeit: + closeit: ${nsProcess::KillProcess} "USdx.exe" $R0 goto continue + ${nsProcess::FindProcess} "ultrastardx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end + + closeusdx: + ${nsProcess::KillProcess} "ultrastardx.exe" $R0 + goto continue + end: ${nsProcess::Unload} Abort -- cgit v1.2.3 From e90d29d966c36002b3460f3f171b1899e5f1e54b Mon Sep 17 00:00:00 2001 From: canni0 Date: Mon, 12 Apr 2010 02:10:26 +0000 Subject: - added note on 'How to translate the installer' - added Hungarian installer language (thx to Gergely BOR) (settings screen is not yet completely translated!) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2228 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 28d1400e..5be85f33 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -20,6 +20,9 @@ !define path_images ".\dependencies\images" !define path_plugins ".\dependencies\plugins" +; MultiLanguage - Show all languages: +!define MUI_LANGDLL_ALLLANGUAGES + !addPluginDir "${path_plugins}\" !include "${path_settings}\variables.nsh" @@ -1316,6 +1319,7 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Hungarian" !insertmacro MUI_RESERVEFILE_LANGDLL @@ -1373,6 +1377,7 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" FunctionEnd -- cgit v1.2.3 From e84ce1549d84604afe8b81ab82059f67b4e3b3b7 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 23 Apr 2010 18:04:03 +0000 Subject: - Redesign of custom settings page New: Ability to select a different song dir New: Select ingame sorting - Updated language file - Fixed: Added resources folder git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2280 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 5be85f33..c7fe26ab 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -151,9 +151,10 @@ Page custom Settings Function Settings -!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" +!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" - !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" +!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" +!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" ; Get all the variables: @@ -164,13 +165,15 @@ var /GLOBAL fullscreen var /GLOBAL language2 var /GLOBAL resolution var /GLOBAL tabs -var /GLOBAL animations +var /GLOBAL sorting +var /GLOBAL songdir - !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State" - !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State" - !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State" - !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State" - !insertmacro INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State" + !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State" + !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State" + !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State" + !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State" + !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" + !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" ; Write all variables to config.ini @@ -190,26 +193,14 @@ StrCpy $path_configini "$path_config\config.ini" ${WriteToConfig} "[Game]$\r$\n" "$path_configini" ${WriteToConfig} "Language=$language2$\r$\n" "$path_configini" ${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini" +${WriteToConfig} "Sorting=$sorting$\r$\n" "$path_configini" ${WriteToConfig} "[Graphics]$\r$\n" "$path_configini" ${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini" ${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini" -${WriteToConfig} "[Sound]$\r$\n" "$path_configini" -${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$path_configini" - -; Animations On / Off Tasks - -${If} $animations == "Off" -${WriteToConfig} "[Advanced]$\r$\n" "$path_configini" -${WriteToConfig} "LoadAnimation=Off$\r$\n" "$path_configini" -${WriteToConfig} "EffectSing=Off$\r$\n" "$path_configini" -${WriteToConfig} "ScreenFade=Off$\r$\n" "$path_configini" -${EndIf} - -${WriteToConfig} "[Lyrics]$\r$\n" "$path_configini" -${WriteToConfig} "LyricsFont=Plain$\r$\n" "$path_configini" -${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$path_configini" +${WriteToConfig} "[Directories]$\r$\n" "$path_configini" +${WriteToConfig} "SongDir2=$songdir$\r$\n" "$path_configini" FunctionEnd ; Settings page End @@ -1379,6 +1370,7 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" + FunctionEnd Function un.onInit -- cgit v1.2.3 From 9003393b3d859040c7bc1b75f2f4025244b921f4 Mon Sep 17 00:00:00 2001 From: canni0 Date: Fri, 23 Apr 2010 19:49:28 +0000 Subject: - Swapped out song downloads in separate file - Added: Song group to store a new song git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2281 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 909 +---------------------------------------- 1 file changed, 4 insertions(+), 905 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index c7fe26ab..e21c601f 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -225,7 +225,6 @@ nsDialogs::Create /NOUNLOAD 1018 nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 - nsDialogs::Show FunctionEnd @@ -278,9 +277,7 @@ Section $(name_section1) Section1 !include "${path_settings}\files_main_install.nsh" - ; Create Shortcuts: - SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -318,906 +315,7 @@ SectionEnd ; OPTIONAL SONGS (Section 2) ;------------------------------------ -SectionGroup $(name_section2) Section2 - -Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 - - AddSize 10342 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song1} $LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" - - SetOutPath "$INSTDIR" - - -SectionEnd - -; -; Dead Smiling Pirates - I 18 -; - -Section /o "Dead Smiling Pirates - I 18" g2Section2 - AddSize 2816 - SetOverwrite try - SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18" - SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song2} $LOCALAPPDATA\Temp\Song-I-18.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\" - - Delete "$LOCALAPPDATA\Temp\Song-I-18.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -; -; Jonathan Coulton Songs -; - -SectionGroup $(name_s2_sub1) s2_sub1 - -Section /o "Monkey Shines" s2_sub1_Section1 - - AddSize 1455 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $LOCALAPPDATA\Temp\Song-JC-MS.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "I Crush Everything" s2_sub1_Section2 - - AddSize 7127 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $LOCALAPPDATA\Temp\Song-JC-ICE.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Not About You" s2_sub1_Section3 - - AddSize 3492 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $LOCALAPPDATA\Temp\Song-JC-NAY.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" - - SetOutPath "$INSTDIR" - - -SectionEnd - -Section /o "Mr. Fancy Pants" s2_sub1_Section4 - - AddSize 2427 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $LOCALAPPDATA\Temp\Song-JC-MFP.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Big Bad World One" s2_sub1_Section5 - - AddSize 4424 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $LOCALAPPDATA\Temp\Song-JC-BBWO.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Flickr" s2_sub1_Section6 - - AddSize 21607 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $LOCALAPPDATA\Temp\Song-JC-Flickr.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "My Beige Bear" s2_sub1_Section7 - - AddSize 4926 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $LOCALAPPDATA\Temp\Song-JC-MBB.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "The Future Soon" s2_sub1_Section8 - - AddSize 5612 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $LOCALAPPDATA\Temp\Song-JC-TFS.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Ikea" s2_sub1_Section9 - - AddSize 4608 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $LOCALAPPDATA\Temp\Song-JC-Ikea.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Furry Old Lobster" s2_sub1_Section10 - - AddSize 3288 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $LOCALAPPDATA\Temp\Song-JC-FOL.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Code Monkey" s2_sub1_Section11 - - AddSize 21402 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $LOCALAPPDATA\Temp\Song-JC-CM.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "I´m Your Moon" s2_sub1_Section12 - - AddSize 4916 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $LOCALAPPDATA\Temp\Song-JC-IYM.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "First Of May" s2_sub1_Section13 - - AddSize 6257 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $LOCALAPPDATA\Temp\Song-JC-FOM.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 - - AddSize 5929 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $LOCALAPPDATA\Temp\Song-JC-DSJD.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "A Talk With George" s2_sub1_Section15 - - AddSize 4076 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $LOCALAPPDATA\Temp\Song-JC-ATWG.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Creepy Doll" s2_sub1_Section16 - - AddSize 66560 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $LOCALAPPDATA\Temp\Song-JC-CD.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "That Spells DNA" s2_sub1_Section17 - - AddSize 4158 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $LOCALAPPDATA\Temp\Song-JC-TSDNA.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "When You Go" s2_sub1_Section18 - - AddSize 5755 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $LOCALAPPDATA\Temp\Song-JC-WYG.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Better" s2_sub1_Section19 - - AddSize 4199 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $LOCALAPPDATA\Temp\Song-JC-Better.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shop Vac" s2_sub1_Section20 - - AddSize 5448 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $LOCALAPPDATA\Temp\Song-JC-SV.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "I Feel Fantastic" s2_sub1_Section21 - - AddSize 3851 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $LOCALAPPDATA\Temp\Song-JC-IFF.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Re: Your Brains" s2_sub1_Section22 - - AddSize 7087 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $LOCALAPPDATA\Temp\Song-JC-ReYB.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Skullcrusher Mountain" s2_sub1_Section23 - - AddSize 6298 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $LOCALAPPDATA\Temp\Song-JC-SCM.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Chiron Beta Prime" s2_sub1_Section24 - - AddSize 38298 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $LOCALAPPDATA\Temp\Song-JC-CBP.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - - -SectionGroupEnd - -; -; Joshua Morin - On The Run -; - -Section /o "Joshua Morin - On The Run" g2Section3 - AddSize 3881 - SetOverwrite try - SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run" - SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song3} $LOCALAPPDATA\Temp\Song-On-the-run.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\" - - Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Pornophonique - Space Invaders" g2Section4 - AddSize 3646 - SetOverwrite try - SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders" - SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song4} $LOCALAPPDATA\Temp\Song-Space-Invaders.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\" - - Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -SectionGroup $(name_s2_sub2) s2_sub2 - -Section /o "Shearer - 69" s2_sub2_Section1 - - AddSize 4557 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $LOCALAPPDATA\Temp\Song-Shearer-69.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 - - AddSize 4772 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - Can't stop it" s2_sub2_Section3 - - AddSize 5510 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $LOCALAPPDATA\Temp\Song-Shearer-CSI.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 - - AddSize 4178 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - In My Hand" s2_sub2_Section5 - - AddSize 5960 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $LOCALAPPDATA\Temp\Song-Shearer-IMH.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - Man Song" s2_sub2_Section6 - - AddSize 7270 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $LOCALAPPDATA\Temp\Song-Shearer-MS.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 - - AddSize 5807 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - Stay With Me" s2_sub2_Section8 - - AddSize 6400 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $LOCALAPPDATA\Temp\Song-Shearer-SWM.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 - - AddSize 5417 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -SectionGroupEnd - -Section /o "Steven Dunston - Northern Star" g2Section5 - AddSize 2427 - SetOverwrite try - SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star" - SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_song5} $LOCALAPPDATA\Temp\Song-Northern-Star.zip - - Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\" - - Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -SectionGroup $(name_s2_sub3) s2_sub3 - -Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 - - AddSize 4015 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 - - AddSize 5335 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3 - - AddSize 5335 - SetOverwrite try - SetOutPath "$INSTDIR\songs\" - -; Download song: - NSISdl::download /TIMEOUT=50000 ${download_sub3_song3} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip - - Pop $R0 - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK - dlok: - - ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\" - - Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" - - SetOutPath "$INSTDIR" - -SectionEnd - -SectionGroupEnd - -SectionGroupEnd + !include "${path_settings}\files_opt_songs.nsh" ;------------------------------------ ; OPTIONAL THEMES (Section 3) @@ -1255,13 +353,15 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) -; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4) +; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) @@ -1370,7 +470,6 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" - FunctionEnd Function un.onInit -- cgit v1.2.3 From 6a0f3847d46b6d03b03140864ee7415d5ad7e575 Mon Sep 17 00:00:00 2001 From: canni0 Date: Thu, 29 Apr 2010 17:27:22 +0000 Subject: - applied patch by tobigun - small changes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2318 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index e21c601f..66b0bd42 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -190,17 +190,16 @@ ${EndIf} StrCpy $path_configini "$path_config\config.ini" -${WriteToConfig} "[Game]$\r$\n" "$path_configini" -${WriteToConfig} "Language=$language2$\r$\n" "$path_configini" -${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini" -${WriteToConfig} "Sorting=$sorting$\r$\n" "$path_configini" +WriteINIStr "$path_configini" "Game" "Language" "$language2" +WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" +WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" -${WriteToConfig} "[Graphics]$\r$\n" "$path_configini" -${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini" -${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini" +WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" +WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" -${WriteToConfig} "[Directories]$\r$\n" "$path_configini" -${WriteToConfig} "SongDir2=$songdir$\r$\n" "$path_configini" +${If} $songdir != "$INSTDIR\songs" +WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" +${EndIf} FunctionEnd ; Settings page End -- cgit v1.2.3 From 818ab818dcc87bacb1acc8448f49c5c5ff99d37f Mon Sep 17 00:00:00 2001 From: canni0 Date: Sat, 1 May 2010 02:25:01 +0000 Subject: - better support for update installation - old files will be removed - uninstaller now deletes all shortcuts - select components in uninstaller: covers, highscores, config, screenshots, playlists, songs git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2325 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 114 ++++++++++++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 25 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 66b0bd42..13cf46d0 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -158,8 +158,20 @@ Function Settings ; Get all the variables: -Var /GLOBAL CHECKBOX -Var /GLOBAL checkbox_state +Var /GLOBAL LABEL_COMPONENTS + +Var /GLOBAL CHECKBOX_COVERS +Var /GLOBAL CB_COVERS_State +Var /GLOBAL CHECKBOX_SCORES +Var /GLOBAL CB_SCORES_State +Var /GLOBAL CHECKBOX_CONFIG +Var /GLOBAL CB_CONFIG_State +Var /GLOBAL CHECKBOX_SCREENSHOTS +Var /GLOBAL CB_SCREENSHOTS_State +Var /GLOBAL CHECKBOX_PLAYLISTS +Var /GLOBAL CB_PLAYLISTS_State +Var /GLOBAL CHECKBOX_SONGS +Var /GLOBAL CB_SONGS_State var /GLOBAL fullscreen var /GLOBAL language2 @@ -219,10 +231,33 @@ Function un.AskDelete nsDialogs::Create /NOUNLOAD 1018 - ${NSD_CreateCheckbox} 0 -150 100% 8u "$(delete_all)" - Pop $CHECKBOX + ${NSD_CreateLabel} 0 -195 100% 12u "$(delete_components)" + Pop $LABEL_COMPONENTS + + ${NSD_CreateCheckbox} 0 -175 100% 8u "$(delete_covers)" + Pop $CHECKBOX_COVERS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_COVERS $1 + + ${NSD_CreateCheckbox} 0 -155 100% 8u "$(delete_config)" + Pop $CHECKBOX_CONFIG + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_CONFIG $2 + + ${NSD_CreateCheckbox} 0 -135 100% 8u "$(delete_highscores)" + Pop $CHECKBOX_SCORES + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SCORES $3 + + ${NSD_CreateCheckbox} 0 -115 100% 8u "$(delete_screenshots)" + Pop $CHECKBOX_SCREENSHOTS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SCREENSHOTS $4 + + ${NSD_CreateCheckbox} 0 -95 100% 8u "$(delete_playlists)" + Pop $CHECKBOX_PLAYLISTS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_PLAYLISTS $5 + + ${NSD_CreateCheckbox} 0 -65 100% 18u "$(delete_songs)" + Pop $CHECKBOX_SONGS + nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SONGS $6 - nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0 nsDialogs::Show @@ -230,29 +265,53 @@ FunctionEnd Function un.DeleteAll -${NSD_GetState} $CHECKBOX $checkbox_state - -${If} $checkbox_state == "1" - -; Remove settings, songs, highscores, covers +${NSD_GetState} $CHECKBOX_COVERS $CB_COVERS_State +${NSD_GetState} $CHECKBOX_CONFIG $CB_CONFIG_State +${NSD_GetState} $CHECKBOX_SCORES $CB_SCORES_State +${NSD_GetState} $CHECKBOX_SCORES $CB_SCREENSHOTS_State +${NSD_GetState} $CHECKBOX_SCORES $CB_PLAYLISTS_State +${NSD_GetState} $CHECKBOX_SONGS $CB_SONGS_State - RMDir /r "$INSTDIR\songs" +${If} $CB_COVERS_State == "1" ; Remove covers RMDir /r "$INSTDIR\covers" - Delete "$INSTDIR\config.ini" - Delete "$INSTDIR\Ultrastar.db" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\songs" RMDir /r "$APPDATA\ultrastardx\covers" - Delete "$APPDATA\ultrastardx\config.ini" - Delete "$APPDATA\ultrastardx\Ultrastar.db" SetShellVarContext all +${EndIf} -${Else} +${If} $CB_CONFIG_State == "1" ; Remove config + SetShellVarContext current + Delete "$APPDATA\ultrastardx\config.ini" + SetShellVarContext all + Delete "$INSTDIR\config.ini" +${EndIf} -; If checkbox_state = 0 +${If} $CB_SCORES_State == "1" ; Remove highscores + SetShellVarContext current + Delete "$APPDATA\ultrastardx\Ultrastar.db" + SetShellVarContext all + Delete "$INSTDIR\Ultrastar.db" +${EndIf} +${If} $CB_SCREENSHOTS_State == "1" ; Remove screenshots + RMDir /r "$INSTDIR\sreenshots" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\screenshots" + SetShellVarContext all +${EndIf} +${If} $CB_SCREENSHOTS_State == "1" ; Remove playlists + RMDir /r "$INSTDIR\playlists" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\playlists" + SetShellVarContext all +${EndIf} + +${If} $CB_SONGS_State == "1" ; Remove songs + RMDir /r "$INSTDIR\songs" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\songs" + SetShellVarContext all ${EndIf} @@ -432,7 +491,7 @@ var /GLOBAL version StrCpy $version "1.1beta" - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' Pop $R0 @@ -445,22 +504,27 @@ StrCpy $version "1.1beta" ${If} $R0 == $version MessageBox MB_YESNO|MB_ICONEXCLAMATION \ "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ - IDYES done + IDYES continue Abort ${EndIf} - ReadRegStr $R1 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" \ - "UninstallString" + ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' StrCmp $R1 "" done + ${If} $R0 != $version MessageBox MB_YESNO|MB_ICONEXCLAMATION \ "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ - IDYES done + IDYES continue Abort ${EndIf} + +continue: + ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' + MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done + ExecWait '"$R2" _?=$INSTDIR' + done: !insertmacro MUI_LANGDLL_DISPLAY -- cgit v1.2.3 From 09809c48f227ffa2bb0fc3948b2ef336ab0110f5 Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 6 Jun 2010 13:48:33 +0000 Subject: unified indentation git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2453 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 437 ++++++++++++++++++++--------------------- 1 file changed, 218 insertions(+), 219 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 13cf46d0..497f53ee 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -151,67 +151,67 @@ Page custom Settings Function Settings -!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" - -!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" -!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" - -; Get all the variables: - -Var /GLOBAL LABEL_COMPONENTS - -Var /GLOBAL CHECKBOX_COVERS -Var /GLOBAL CB_COVERS_State -Var /GLOBAL CHECKBOX_SCORES -Var /GLOBAL CB_SCORES_State -Var /GLOBAL CHECKBOX_CONFIG -Var /GLOBAL CB_CONFIG_State -Var /GLOBAL CHECKBOX_SCREENSHOTS -Var /GLOBAL CB_SCREENSHOTS_State -Var /GLOBAL CHECKBOX_PLAYLISTS -Var /GLOBAL CB_PLAYLISTS_State -Var /GLOBAL CHECKBOX_SONGS -Var /GLOBAL CB_SONGS_State - -var /GLOBAL fullscreen -var /GLOBAL language2 -var /GLOBAL resolution -var /GLOBAL tabs -var /GLOBAL sorting -var /GLOBAL songdir - - !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State" - !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State" - !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State" - !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State" - !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" - !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" - -; Write all variables to config.ini - -var /GLOBAL path_config -var /GLOBAL path_configini - -${If} ${AtLeastWinVista} - SetShellVarContext current - StrCpy $path_config "$APPDATA\ultrastardx" - SetShellVarContext all -${Else} - StrCpy $path_config "$INSTDIR" -${EndIf} - -StrCpy $path_configini "$path_config\config.ini" - -WriteINIStr "$path_configini" "Game" "Language" "$language2" -WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" -WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" - -WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" -WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" - -${If} $songdir != "$INSTDIR\songs" -WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" -${EndIf} + !insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" + + !insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)" + !insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" + + ; Get all the variables: + + Var /GLOBAL LABEL_COMPONENTS + + Var /GLOBAL CHECKBOX_COVERS + Var /GLOBAL CB_COVERS_State + Var /GLOBAL CHECKBOX_SCORES + Var /GLOBAL CB_SCORES_State + Var /GLOBAL CHECKBOX_CONFIG + Var /GLOBAL CB_CONFIG_State + Var /GLOBAL CHECKBOX_SCREENSHOTS + Var /GLOBAL CB_SCREENSHOTS_State + Var /GLOBAL CHECKBOX_PLAYLISTS + Var /GLOBAL CB_PLAYLISTS_State + Var /GLOBAL CHECKBOX_SONGS + Var /GLOBAL CB_SONGS_State + + Var /GLOBAL fullscreen + Var /GLOBAL language2 + Var /GLOBAL resolution + Var /GLOBAL tabs + Var /GLOBAL sorting + Var /GLOBAL songdir + + !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State" + !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State" + !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State" + !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State" + !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" + !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" + + ; Write all variables to config.ini + + var /GLOBAL path_config + var /GLOBAL path_configini + + ${If} ${AtLeastWinVista} + SetShellVarContext current + StrCpy $path_config "$APPDATA\ultrastardx" + SetShellVarContext all + ${Else} + StrCpy $path_config "$INSTDIR" + ${EndIf} + + StrCpy $path_configini "$path_config\config.ini" + + WriteINIStr "$path_configini" "Game" "Language" "$language2" + WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" + WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" + + WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" + WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" + + ${If} $songdir != "$INSTDIR\songs" + WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" + ${EndIf} FunctionEnd ; Settings page End @@ -229,7 +229,7 @@ UninstPage custom un.AskDelete un.DeleteAll Function un.AskDelete -nsDialogs::Create /NOUNLOAD 1018 + nsDialogs::Create /NOUNLOAD 1018 ${NSD_CreateLabel} 0 -195 100% 12u "$(delete_components)" Pop $LABEL_COMPONENTS @@ -259,7 +259,7 @@ nsDialogs::Create /NOUNLOAD 1018 nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SONGS $6 -nsDialogs::Show + nsDialogs::Show FunctionEnd @@ -273,45 +273,45 @@ ${NSD_GetState} $CHECKBOX_SCORES $CB_PLAYLISTS_State ${NSD_GetState} $CHECKBOX_SONGS $CB_SONGS_State ${If} $CB_COVERS_State == "1" ; Remove covers - RMDir /r "$INSTDIR\covers" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\covers" - SetShellVarContext all + RMDir /r "$INSTDIR\covers" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\covers" + SetShellVarContext all ${EndIf} ${If} $CB_CONFIG_State == "1" ; Remove config - SetShellVarContext current - Delete "$APPDATA\ultrastardx\config.ini" - SetShellVarContext all - Delete "$INSTDIR\config.ini" + SetShellVarContext current + Delete "$APPDATA\ultrastardx\config.ini" + SetShellVarContext all + Delete "$INSTDIR\config.ini" ${EndIf} ${If} $CB_SCORES_State == "1" ; Remove highscores - SetShellVarContext current - Delete "$APPDATA\ultrastardx\Ultrastar.db" - SetShellVarContext all - Delete "$INSTDIR\Ultrastar.db" + SetShellVarContext current + Delete "$APPDATA\ultrastardx\Ultrastar.db" + SetShellVarContext all + Delete "$INSTDIR\Ultrastar.db" ${EndIf} ${If} $CB_SCREENSHOTS_State == "1" ; Remove screenshots - RMDir /r "$INSTDIR\sreenshots" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\screenshots" - SetShellVarContext all + RMDir /r "$INSTDIR\sreenshots" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\screenshots" + SetShellVarContext all ${EndIf} ${If} $CB_SCREENSHOTS_State == "1" ; Remove playlists - RMDir /r "$INSTDIR\playlists" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\playlists" - SetShellVarContext all + RMDir /r "$INSTDIR\playlists" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\playlists" + SetShellVarContext all ${EndIf} ${If} $CB_SONGS_State == "1" ; Remove songs - RMDir /r "$INSTDIR\songs" - SetShellVarContext current - RMDir /r "$APPDATA\ultrastardx\songs" - SetShellVarContext all + RMDir /r "$INSTDIR\songs" + SetShellVarContext current + RMDir /r "$APPDATA\ultrastardx\songs" + SetShellVarContext all ${EndIf} @@ -333,39 +333,39 @@ Section $(name_section1) Section1 SetOutPath $INSTDIR SetOverwrite try -!include "${path_settings}\files_main_install.nsh" + !include "${path_settings}\files_main_install.nsh" -; Create Shortcuts: -SetOutPath "$INSTDIR" + ; Create Shortcuts: + SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - SetShellVarContext all - SetOutPath "$INSTDIR" - - CreateDirectory "${name}" - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" + SetShellVarContext all + SetOutPath "$INSTDIR" + + CreateDirectory "${name}" + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_END -; Vista Game Explorer: -; (removed due to incompatibility with Windows 7, needs rewrite) + ; Vista Game Explorer: + ; (removed due to incompatibility with Windows 7, needs rewrite) -; Create Uninstaller: + ; Create Uninstaller: - WriteUninstaller "$INSTDIR\Uninstall.exe" + WriteUninstaller "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" - SetOutPath "$INSTDIR" + SetOutPath "$INSTDIR" SectionEnd @@ -388,14 +388,14 @@ SectionEnd Section Uninstall - !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP + !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP - !include "${path_settings}\files_main_uninstall.nsh" + !include "${path_settings}\files_main_uninstall.nsh" - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" -; Unregister from Windows Vista Game Explorer -; (removed due to incompatibility with Windows 7) + ; Unregister from Windows Vista Game Explorer + ; (removed due to incompatibility with Windows 7) SectionEnd @@ -406,59 +406,59 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4) -; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES - - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6) - - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) - - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9) - - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4) +; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES + + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9) + + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3) !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -475,89 +475,88 @@ SectionEnd !include "${path_languages}\*.nsh" ;!addPluginDir "${path_plugins}\" - + Function bgmusic - File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav - BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav + File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav + BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav FunctionEnd Function .onGUIEnd - BGImage::Sound /STOP + BGImage::Sound /STOP FunctionEnd Function .onInit -var /GLOBAL version -StrCpy $version "1.1beta" + var /GLOBAL version + StrCpy $version "1.1beta" - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' - Pop $R0 + Pop $R0 - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) - Abort + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running) + Abort - ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' + ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion' - ${If} $R0 == $version - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ - IDYES continue - Abort - ${EndIf} + ${If} $R0 == $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \ + IDYES continue + Abort + ${EndIf} - ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' - StrCmp $R1 "" done + ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' + StrCmp $R1 "" done - ${If} $R0 != $version - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ - IDYES continue - Abort - ${EndIf} + ${If} $R0 != $version + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \ + IDYES continue + Abort + ${EndIf} continue: - ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done - ExecWait '"$R2" _?=$INSTDIR' + ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString' + MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done + ExecWait '"$R2" _?=$INSTDIR' done: + !insertmacro MUI_LANGDLL_DISPLAY - !insertmacro MUI_LANGDLL_DISPLAY - - !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" - !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" - !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" FunctionEnd Function un.onInit - ${nsProcess::FindProcess} "USdx.exe" $R0 - StrCmp $R0 0 0 +2 - MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end + ${nsProcess::FindProcess} "USdx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end - closeit: - ${nsProcess::KillProcess} "USdx.exe" $R0 - goto continue +closeit: + ${nsProcess::KillProcess} "USdx.exe" $R0 + goto continue - ${nsProcess::FindProcess} "ultrastardx.exe" $R0 - StrCmp $R0 0 0 +2 - MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end + ${nsProcess::FindProcess} "ultrastardx.exe" $R0 + StrCmp $R0 0 0 +2 + MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end - closeusdx: +closeusdx: ${nsProcess::KillProcess} "ultrastardx.exe" $R0 - goto continue + goto continue - end: - ${nsProcess::Unload} - Abort +end: + ${nsProcess::Unload} + Abort - continue: - !insertmacro MUI_LANGDLL_DISPLAY +continue: + !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd -- cgit v1.2.3 From e73913f7f2d00a26741b266ca29d5b45c5896651 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 8 Jun 2010 18:18:29 +0000 Subject: installer adjusted to config.ini detection git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2455 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 102 ++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 26 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 497f53ee..125dfefc 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -7,6 +7,7 @@ !include LogicLib.nsh !include InstallOptions.nsh !include nsDialogs.nsh +!include UAC.nsh ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Variables @@ -49,8 +50,8 @@ InstallDir "$PROGRAMFILES\${name}" InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\UltraStar Deluxe" "InstallDir" ; Windows Vista / Windows 7: - -RequestExecutionLevel admin +; must be "user" for UAC plugin +RequestExecutionLevel user ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ; Interface Settings @@ -109,8 +110,16 @@ RequestExecutionLevel admin !define MUI_FINISHPAGE_TEXT_LARGE !define MUI_FINISHPAGE_TEXT "$(page_finish_txt)" -!define MUI_FINISHPAGE_RUN "$INSTDIR\${exe}.exe" +; MUI_FINISHPAGE_RUN is executed as admin by default. +; To get the config.ini location right it must be executed with user +; rights instead. +!define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN_NOTCHECKED +!define MUI_FINISHPAGE_RUN_FUNCTION RunAppAsUser + +Function RunAppAsUser + UAC::ShellExec 'open' '' '$INSTDIR\${exe}.exe' '' '$INSTDIR' +FunctionEnd !define MUI_FINISHPAGE_LINK "$(page_finish_linktxt)" !define MUI_FINISHPAGE_LINK_LOCATION "${homepage}" @@ -135,7 +144,7 @@ RequestExecutionLevel admin ; Start menu page -var ICONS_GROUP +Var ICONS_GROUP !define MUI_STARTMENUPAGE_NODISABLE !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}" !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" @@ -149,6 +158,50 @@ var ICONS_GROUP Page custom Settings + +; User data info + +Var UseAppData ; true if APPDATA is used for user data, false for INSTDIR +Var UserDataPath ; Path to user data dir (e.g. $INSTDIR) +Var ConfigIniPath ; Path to config.ini (e.g. "$INSTDIR\config.ini") + +; Checks for write permissions on $INSTDIR\config.ini. +; This function creates $INSTDIR\config.use as a marker file if +; the user has write permissions. +; Note: Must be run with user privileges +Function CheckInstDirUserPermissions + ClearErrors + ; try to open the ini file. + ; Use "append" mode so an existing config.ini is not destroyed. + FileOpen $0 "$INSTDIR\config.ini" a + IfErrors end + ; we have write permissions -> create a marker file + FileOpen $1 "$INSTDIR\config.use" a + FileClose $1 +end: + FileClose $0 +FunctionEnd + +; Determines the directory used for config.ini and other user +; settings and data. +; Sets $UseAppData, $UserDataPath and $ConfigIniPath +Function DetermineUserDataDir + Delete "$INSTDIR\config.use" + !insertmacro UAC.CallFunctionAsUser CheckInstDirUserPermissions + IfFileExists "$INSTDIR\config.use" 0 notexists + StrCpy $UseAppData false + StrCpy $UserDataPath "$INSTDIR" + Goto end +notexists: + StrCpy $UseAppData true + SetShellVarContext current + StrCpy $UserDataPath "$APPDATA\ultrastardx" + SetShellVarContext all +end: + Delete "$INSTDIR\config.use" + StrCpy $ConfigIniPath "$UserDataPath\config.ini" +FunctionEnd + Function Settings !insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs" @@ -187,32 +240,17 @@ Function Settings !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State" !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State" - ; Write all variables to config.ini - - var /GLOBAL path_config - var /GLOBAL path_configini - - ${If} ${AtLeastWinVista} - SetShellVarContext current - StrCpy $path_config "$APPDATA\ultrastardx" - SetShellVarContext all - ${Else} - StrCpy $path_config "$INSTDIR" - ${EndIf} - - StrCpy $path_configini "$path_config\config.ini" - - WriteINIStr "$path_configini" "Game" "Language" "$language2" - WriteINIStr "$path_configini" "Game" "Tabs" "$tabs" - WriteINIStr "$path_configini" "Game" "Sorting" "$sorting" + WriteINIStr "$ConfigIniPath" "Game" "Language" "$language2" + WriteINIStr "$ConfigIniPath" "Game" "Tabs" "$tabs" + WriteINIStr "$ConfigIniPath" "Game" "Sorting" "$sorting" - WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen" - WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution" + WriteINIStr "$ConfigIniPath" "Graphics" "FullScreen" "$fullscreen" + WriteINIStr "$ConfigIniPath" "Graphics" "Resolution" "$resolution" ${If} $songdir != "$INSTDIR\songs" - WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir" + WriteINIStr "$ConfigIniPath" "Directories" "SongDir1" "$songdir" ${EndIf} - + FunctionEnd ; Settings page End !insertmacro MUI_PAGE_FINISH @@ -333,6 +371,8 @@ Section $(name_section1) Section1 SetOutPath $INSTDIR SetOverwrite try + Call DetermineUserDataDir + !include "${path_settings}\files_main_install.nsh" ; Create Shortcuts: @@ -487,6 +527,8 @@ FunctionEnd Function .onInit + ${UAC.I.Elevate.AdminOnly} + var /GLOBAL version StrCpy $version "1.1beta" @@ -560,3 +602,11 @@ continue: !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd + +Function .onInstFailed + ${UAC.Unload} +FunctionEnd + +Function .onInstSuccess + ${UAC.Unload} +FunctionEnd \ No newline at end of file -- cgit v1.2.3 From f0f0d4b3f9c1e343edf6dfddc04cf25d3b52b496 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 8 Jun 2010 18:27:37 +0000 Subject: string update git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2456 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 125dfefc..f83cb99c 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -530,7 +530,7 @@ Function .onInit ${UAC.I.Elevate.AdminOnly} var /GLOBAL version - StrCpy $version "1.1beta" + StrCpy $version "1.1RC" System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' @@ -609,4 +609,4 @@ FunctionEnd Function .onInstSuccess ${UAC.Unload} -FunctionEnd \ No newline at end of file +FunctionEnd -- cgit v1.2.3 From 9a1031db332cdd8d9a89a5372aad07071ecb92cf Mon Sep 17 00:00:00 2001 From: canni0 Date: Sun, 13 Jun 2010 15:00:39 +0000 Subject: - added polish language to installer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2520 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index f83cb99c..6eeeefb1 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -509,6 +509,7 @@ SectionEnd !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Polish" !insertmacro MUI_RESERVEFILE_LANGDLL @@ -573,6 +574,7 @@ done: !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033" !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038" + !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1045.ini" "Settings-1045" FunctionEnd -- cgit v1.2.3 From 5e13354bb1fcee732a92c89d6d0ac9888f43daeb Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 10 Oct 2010 18:55:31 +0000 Subject: strings adjusted (removed 'RC'-parts) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2656 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/UltraStar Deluxe.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/UltraStar Deluxe.nsi') diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index 6eeeefb1..e98edc54 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -531,7 +531,7 @@ Function .onInit ${UAC.I.Elevate.AdminOnly} var /GLOBAL version - StrCpy $version "1.1RC" + StrCpy $version "1.1" System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' -- cgit v1.2.3