From 75cbe187a6572e904e2f931c6a1902b186eec844 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 2 Nov 2018 07:59:51 -0400 Subject: DRTVWR-447: Back out changeset 69118ad33b45: directly run updater from NSIS installer, instead of via explorer.exe. A recent test run performed the install, then opened an Explorer window on My Documents. --- indra/newview/installers/windows/installer_template.nsi | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index adcf8fd0e4..76187b49a5 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -705,21 +705,10 @@ Function .onInstSuccess # updater can detect the problem and adapt accordingly. # Once everything is in order, the updater will run the specified # viewer with the specified params. - # 'Exec updater' causes the viewer to inherit elevated Admin privileges. See - # http://mdb-blog.blogspot.com/2013/01/nsis-lunch-program-as-user-from-uac.html - # for workaround: running the updater via explorer.exe. - # Thing is, you can't pass parameters with the explorer.exe trick, so - # you have to create a shortcut or a .bat file. Since we don't want a - # permanent shortcut for the user to relaunch the updater like this - # first time, create it in a temp location and delete it once we've - # used it. # Quote the updater executable and the viewer executable because each # must be a distinct command-line token, but DO NOT quote the language # string because it must decompose into separate command-line tokens. - CreateShortCut "$TEMP\SLFirst.lnk" "$INSTDIR\$INSTEXE" \ - 'precheck "$INSTDIR\$VIEWER_EXE" $SHORTCUT_LANG_PARAM' - Exec '"$WINDIR\explorer.exe" "$TEMP\SLFirst.lnk"' - Delete "$TEMP\SLFirst.lnk" + Exec '"$INSTDIR\$INSTEXE" precheck "$INSTDIR\$VIEWER_EXE" $SHORTCUT_LANG_PARAM' Pop $R0 # FunctionEnd -- cgit v1.2.3