diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
| commit | cf74a9438aae7ab1b10c7ffa77c6509e588869a0 (patch) | |
| tree | 79c2714ba2bb2e0d526b5644f5b832c911fe6900 /indra/newview/installers/windows/installer_template.nsi | |
| parent | 24ed3844afe2d54a03975c1704c595cf02e5643f (diff) | |
| parent | 5754493cdcfeac76d0576abc19bdf5a03717780d (diff) | |
Merge
Diffstat (limited to 'indra/newview/installers/windows/installer_template.nsi')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index ade808e3e2..cd867d79b3 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -324,11 +324,6 @@ CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \ CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
'"$INSTDIR\uninst.exe"' ''
-# Create *.bat file to specify lang params on first run from installer - see MAINT-5259S
-FileOpen $9 "$INSTDIR\autorun.bat" w
-FileWrite $9 'start "$INSTDIR\$INSTEXE" /d "$INSTDIR" "$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM$\r$\n'
-FileClose $9
-
# Write registry
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"
@@ -724,7 +719,7 @@ Call CheckWindowsServPack # Warn if not on the latest SP before asking to launc Push $R0 # Option value, unused#
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
- Exec '"$WINDIR\explorer.exe" "$INSTDIR\autorun.bat"'
+ Exec '"$WINDIR\explorer.exe" "$INSTDIR\$INSTSHORTCUT.lnk"'
Pop $R0
#
FunctionEnd
|