Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Windows installer: use AppData\Local\Pandoc by default.

Browse source 
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.
This commit is contained in:
John MacFarlane 2015-06-29 09:39:39 -07:00
parent 27754e170b
commit d0ed2560ab
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
windows/pandoc.wxs
View file

@ -110,10 +110,21 @@
may need to restart Cmd/Powershell windows before using it." 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> <InstallUISequence>
<Custom Action="SetExitDialogOptText" Before="ExecuteAction"> <Custom Action="SetExitDialogOptText" Before="ExecuteAction">
NOT Installed NOT Installed
</Custom> </Custom>
<Custom Action="CustomWixSetPerUserFolder" After="WixSetPerUserFolder">
ACTION="INSTALL" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))
</Custom>
</InstallUISequence> </InstallUISequence>
<CustomActionRef Id="WixBroadcastSettingChange" /> <CustomActionRef Id="WixBroadcastSettingChange" />