diff --git a/Utils/NSIS/GetVersion.zip b/Utils/NSIS/GetVersion.zip deleted file mode 100644 index 0300f2f0e7..0000000000 Binary files a/Utils/NSIS/GetVersion.zip and /dev/null differ diff --git a/Utils/NSIS/Nsisos.zip b/Utils/NSIS/Nsisos.zip new file mode 100644 index 0000000000..9f2fd74195 Binary files /dev/null and b/Utils/NSIS/Nsisos.zip differ diff --git a/Utils/NSIS/readme.txt b/Utils/NSIS/readme.txt index 19a3023b90..c2ed71fd70 100644 --- a/Utils/NSIS/readme.txt +++ b/Utils/NSIS/readme.txt @@ -1,8 +1,8 @@ In this folder are local copies of things required to properly build the StepMania installer. -Right now, this is just the GetVersion plugin (so that we can write the files +Right now, this is just the NSIS-OS plugin (so that we can write the files to somewhere that isn't Program Files on Windows Vista/7). -The GetVersion plugin can alternatively be downloaded from here: -http://nsis.sourceforge.net/GetVersion_%28Windows%29_plug-in \ No newline at end of file +The NSIS-OS plugin can be alternatively downloaded from here: +http://nsis.sourceforge.net/NSIS-OS_plug-in \ No newline at end of file diff --git a/sm-ssc.nsi b/sm-ssc.nsi index 8b8e8f4ad0..22b2e9c652 100644 --- a/sm-ssc.nsi +++ b/sm-ssc.nsi @@ -54,14 +54,6 @@ ; I think it may need actual admin privs for writing to the registry... -aj ;RequestExecutionLevel user - ;GetVersion::WindowsServicePackMajor - ;Pop $R0 - ;${If} $R0 >= 6 - ; vista & 7 - ;${Else} - ; xp and below - ;${EndIf} - InstallDir "$PROGRAMFILES\${PRODUCT_ID}" InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${PRODUCT_ID}" "" @@ -97,9 +89,6 @@ !insertmacro MUI_PAGE_WELCOME - ; include various Windows-only notices - !insertmacro MUI_PAGE_LICENSE ".\Docs\WindowsNotes.txt" - ;!insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES @@ -681,6 +670,12 @@ FunctionEnd Function .onInit + nsisos::osversion + ${If} $R0 >= 6 + ;vista & win7 + StrCpy $INSTDIR "%HOMEPATH%\${PRODUCT_ID}" + ${EndIf} + ; Force show language selection for debugging ;!define MUI_LANGDLL_ALWAYSSHOW !insertmacro MUI_LANGDLL_DISPLAY