From d0ed2560ab7cd0960bc0245f633ed40f3939c6f1 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 29 Jun 2015 09:39:39 -0700
Subject: Windows installer:  use AppData\Local\Pandoc by default.

Not AppData\Local\Apps\Pandoc as wix was now doing.

It is going to be easier if we don't change the install
directory so that users end up with two versions.
---
 windows/pandoc.wxs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'windows/pandoc.wxs')

diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 0403be2a5..fea3ec554 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -110,10 +110,21 @@
       may need to restart Cmd/Powershell windows before using it."
      />
 
+    <CustomAction Id="CustomWixSetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder][ApplicationFolderName]" Execute="immediate" />
+
+    <InstallExecuteSequence>
+        <Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder">
+            ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
+        </Custom>
+    </InstallExecuteSequence>
+
     <InstallUISequence>
         <Custom Action="SetExitDialogOptText" Before="ExecuteAction">
              NOT Installed
         </Custom>
+        <Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder">
+            ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
+        </Custom>
     </InstallUISequence>
 
     <CustomActionRef Id="WixBroadcastSettingChange" />
-- 
cgit v1.2.3