#4588 Test

Author: akleshchev

indra/newview/installers/windows/installer_template.nsi

@@ -258,21 +258,24 @@ Function .onInit
 # However, SL-10506 complains about the resulting behavior, so the logic below
 # is adapted from before we introduced MultiUser.nsh.
 
+MessageBox MB_OK "Install path:'$INSTDIR' InstallDir:'$InstallDir' InstallDirRegKey:'$InstallDirRegKey'"
 # Check if user specified /D= on the command line
-System::Call 'kernel32::GetCommandLine()t .r1'
-StrCpy $1 $R1
-Push $1
+System::Call 'kernel32::GetCommandLine()t .r0'
+MessageBox MB_OK "data0:'$0'"
+Push $0
 Push " /D="
 Call StrStr
-Pop $2
-StrCmp $2 "" 0 after_instdir
+Pop $1
+MessageBox MB_OK "data1:'$1'"
+StrCmp $1 "" 0 after_instdir
 
 # if $0 is empty, this is the first time for this viewer name
 ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" ""
 
 # viewer with this name was installed before
 ${If} $0 != ""
     # use the value we got from registry as install location
+    MessageBox MB_OK "Using value from registry:'$0'"
     StrCpy $INSTDIR $0
 ${EndIf}