From b3a8be783d7e8fee70fa558d06194a2dae7b8c67 Mon Sep 17 00:00:00 2001 From: Renato Silva Date: Sun, 17 Apr 2016 21:36:48 -0300 Subject: [PATCH] msys2-installer: Simplify shortcuts. * Remove unnecessary call to command processor. * Replace multiple batch scripts calls with single one. --- .../com.msys2.root.base/meta/installscript.js | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js b/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js index 3b8798b4..4bd7014d 100644 --- a/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js +++ b/msys2-installer/qt-ifw/packages/com.msys2.root.base/meta/installscript.js @@ -17,21 +17,10 @@ function createShortcuts() return; } - var cmdLocation = windir + "\\system32\\cmd.exe"; - component.addOperation( "CreateShortcut", - cmdLocation, - "@StartMenuDir@/MSYS2 Shell.lnk", - "/A /Q /C " + installer.value("TargetDir") + "\\msys2_shell.bat"); - - component.addOperation( "CreateShortcut", - cmdLocation, - "@StartMenuDir@/MinGW-w64 Win32 Shell.lnk", - "/A /Q /C " + installer.value("TargetDir") + "\\mingw32_shell.bat"); - - component.addOperation( "CreateShortcut", - cmdLocation, - "@StartMenuDir@/MinGW-w64 Win64 Shell.lnk", - "/A /Q /C " + installer.value("TargetDir") + "\\mingw64_shell.bat"); + var cmdLocation = installer.value("TargetDir") + "\\start_shell.cmd"; + component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MinGW 32-bit.lnk", "-mingw32"); + component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MinGW 64-bit.lnk", "-mingw64"); + component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MSYS.lnk", "-msys"); if ("@BITNESS@bit" === "32bit") { component.addOperation( "Execute",