dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* strip quotes and /S from RegTool's RunOnce key before checking if it exists

Browse source 
* added random data to the extraction name of RegTool to avoid problems with install->reboot->install->reboot


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4317 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-10-11 16:47:58 +00:00
parent babe73be5b
commit 315c7b1d64
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/Library.nsh
View file

@ -86,11 +86,12 @@
;Setup RegTool ;Setup RegTool
ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v2" ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v2"
StrCpy $R3 $R3 -4 1
IfFileExists $R3 +3 IfFileExists $R3 +3
File /oname=$R2\NSIS.Library.RegTool.v2.exe "${NSISDIR}\Bin\RegTool.bin" File /oname=$R2\NSIS.Library.RegTool.v2.exe "${NSISDIR}\Bin\RegTool.bin"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" \ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" \
"NSIS.Library.RegTool.v2" '"$R2\NSIS.Library.RegTool.v2.exe" /S' "NSIS.Library.RegTool.v2" '"$R2\NSIS.Library.RegTool.v2.$__INSTALLLLIB_SESSIONGUID.exe" /S'
;------------------------ ;------------------------
;Add RegTool entry ;Add RegTool entry

3
Include/UpgradeDLL.nsh
View file

@ -68,11 +68,12 @@ Example:
;Setup RegTool ;Setup RegTool
ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v2" ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v2"
StrCpy $R3 $R3 -4 1
IfFileExists $R3 +3 IfFileExists $R3 +3
File /oname=$R2\NSIS.Library.RegTool.v2.exe "${NSISDIR}\Bin\RegTool.bin" File /oname=$R2\NSIS.Library.RegTool.v2.exe "${NSISDIR}\Bin\RegTool.bin"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" \ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" \
"NSIS.Library.RegTool.v2" '"$R2\NSIS.Library.RegTool.v2.exe" /S' "NSIS.Library.RegTool.v2" '"$R2\NSIS.Library.RegTool.v2.$HWNDPARENT.exe" /S'
;------------------------ ;------------------------
;Add RegTool entry ;Add RegTool entry