git.iko.soy/typeable/pandoc
on master help sign in
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.

commitd0ed2560ab7cd0960bc0245f633ed40f3939c6f1 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 29 Jun 2015, 09:39 (11 years ago) parent27754e1
1 file changed+11
compare with master
unifiedsplit
windows/pandoc.wxs+11
windows/pandoc.wxs+11
@@ -110,10 +110,21 @@
110110 may need to restart Cmd/Powershell windows before using it."
111111 />
112112
113+ <CustomAction Id="CustomWixSetPerUserFolder" Property="APPLICATIONFOLDER" Value="[LocalAppDataFolder][ApplicationFolderName]" Execute="immediate" />
114+
115+ <InstallExecuteSequence>
116+ <Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder">
117+ ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
118+ </Custom>
119+ </InstallExecuteSequence>
120+
113121 <InstallUISequence>
114122 <Custom Action="SetExitDialogOptText" Before="ExecuteAction">
115123 NOT Installed
116124 </Custom>
125+ <Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder">
126+ ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
127+ </Custom>
117128 </InstallUISequence>
118129
119130 <CustomActionRef Id="WixBroadcastSettingChange" />