From 7a79c9b18527a3423ca403b77a38112a7ba1e538 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 6 Mar 2017 15:21:57 +0300
Subject: [PATCH] IDEA-169185 Installation destination folder for 64-bit and
 32-bit Windows OS.

---
 build/conf/nsis/idea.nsi | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index f1680e84f67b..c764c707fb41 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -475,7 +475,11 @@ UAC_Success:
     StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
     goto UAC_Elevate
 UAC_Admin:
-    StrCpy $INSTDIR "$PROGRAMFILES\${MANUFACTURER}\${PRODUCT_WITH_VER}"
+    ${If} ${RunningX64}
+      StrCpy $INSTDIR "$PROGRAMFILES64\${MANUFACTURER}\${PRODUCT_WITH_VER}"
+    ${Else}
+      StrCpy $INSTDIR "$PROGRAMFILES\${MANUFACTURER}\${PRODUCT_WITH_VER}"
+    ${EndIf}
     SetShellVarContext all
     StrCpy $baseRegKey "HKLM"
 UAC_Done:
@@ -720,7 +724,11 @@ continue_enum_versions_hklm:
 end_enum_versions_hklm:
 
   StrCmp $INSTDIR "" 0 skip_default_instdir
-  StrCpy $INSTDIR "$PROGRAMFILES\${MANUFACTURER}\${MUI_PRODUCT} ${MUI_VERSION_MAJOR}.${MUI_VERSION_MINOR}"
+  ${If} ${RunningX64}
+    StrCpy $INSTDIR "$PROGRAMFILES64\${MANUFACTURER}\${MUI_PRODUCT} ${MUI_VERSION_MAJOR}.${MUI_VERSION_MINOR}"
+  ${Else}
+    StrCpy $INSTDIR "$PROGRAMFILES\${MANUFACTURER}\${MUI_PRODUCT} ${MUI_VERSION_MAJOR}.${MUI_VERSION_MINOR}"
+  ${EndIf}
 skip_default_instdir:
 
   Pop $5
@@ -935,7 +943,11 @@ HKLM:
   goto Done
 cant_find_installation:
   ;admin perm. is required to uninstall?
-  ${UnStrStr} $R0 $INSTDIR $PROGRAMFILES
+  ${If} ${RunningX64}
+    ${UnStrStr} $R0 $INSTDIR $PROGRAMFILES64
+  ${Else}
+    ${UnStrStr} $R0 $INSTDIR $PROGRAMFILES
+  ${EndIf}
   StrCmp $R0 $INSTDIR HKLM HKCU
 Done:
 FunctionEnd