Fixed the installer script and made the autostart registry based.

1 files changed, 23 insertions, 20 deletions

diff --git a/setup.nsi b/setup.nsi
index f49fe310d6..56a46ea3eb 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -53,7 +53,7 @@ VIAddVersionKey CompanyWebsite "${URL}"
 VIAddVersionKey FileVersion "${VERSION}"

 VIAddVersionKey FileDescription ""

 VIAddVersionKey LegalCopyright ""

-InstallDirRegKey HKLM "${REGKEY}" Path

+InstallDirRegKey HKCU "${REGKEY}" Path

 ShowUninstDetails show

 

 # Installer sections

@@ -63,32 +63,33 @@ Section -Main SEC0000
     File bitcoin.exe

     File libeay32.dll

     File mingwm10.dll

-    WriteRegStr HKLM "${REGKEY}\Components" Main 1

+    WriteRegStr HKCU "${REGKEY}\Components" Main 1

+    WriteRegStr HKCU SOFTWARE\Microsoft\Windows\CurrentVersion\Run Bitcoin "$INSTDIR\bitcoin.exe /min"

 SectionEnd

 

 Section -post SEC0001

-    WriteRegStr HKLM "${REGKEY}" Path $INSTDIR

+    WriteRegStr HKCU "${REGKEY}" Path $INSTDIR

     SetOutPath $INSTDIR

     WriteUninstaller $INSTDIR\uninstall.exe

     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

-    SetOutPath $SMPROGRAMS\$StartMenuGroup

+    CreateDirectory $SMPROGRAMS\$StartMenuGroup

     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin.exe

     CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe

     !insertmacro MUI_STARTMENU_WRITE_END

-    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"

-    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"

-    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"

-    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"

-    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe

-    WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe

-    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1

-    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1

+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"

+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"

+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"

+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"

+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe

+    WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe

+    WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1

+    WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1

 SectionEnd

 

 # Macro for selecting uninstaller sections

 !macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID

     Push $R0

-    ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}"

+    ReadRegStr $R0 HKCU "${REGKEY}\Components" "${SECTION_NAME}"

     StrCmp $R0 1 0 next${UNSECTION_ID}

     !insertmacro SelectSection "${UNSECTION_ID}"

     GoTo done${UNSECTION_ID}

@@ -103,18 +104,20 @@ Section /o -un.Main UNSEC0000
     Delete /REBOOTOK $INSTDIR\mingwm10.dll

     Delete /REBOOTOK $INSTDIR\libeay32.dll

     Delete /REBOOTOK $INSTDIR\bitcoin.exe

-    DeleteRegValue HKLM "${REGKEY}\Components" Main

+    DeleteRegValue HKCU "${REGKEY}\Components" Main

+    DeleteRegValue HKCU SOFTWARE\Microsoft\Windows\CurrentVersion\Run Bitcoin

 SectionEnd

 

 Section -un.post UNSEC0001

-    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"

+    DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"

     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk"

     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"

     Delete /REBOOTOK $INSTDIR\uninstall.exe

-    DeleteRegValue HKLM "${REGKEY}" StartMenuGroup

-    DeleteRegValue HKLM "${REGKEY}" Path

-    DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components"

-    DeleteRegKey /IfEmpty HKLM "${REGKEY}"

+    Delete /REBOOTOK $INSTDIR\db.log

+    DeleteRegValue HKCU "${REGKEY}" StartMenuGroup

+    DeleteRegValue HKCU "${REGKEY}" Path

+    DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"

+    DeleteRegKey /IfEmpty HKCU "${REGKEY}"

     RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup

     RmDir /REBOOTOK $INSTDIR

     Push $R0

@@ -131,7 +134,7 @@ FunctionEnd
 

 # Uninstaller functions

 Function un.onInit

-    ReadRegStr $INSTDIR HKLM "${REGKEY}" Path

+    ReadRegStr $INSTDIR HKCU "${REGKEY}" Path

     !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup

     !insertmacro SELECT_UNSECTION Main ${UNSEC0000}

 FunctionEnd