diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-06-29 09:39:39 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-06-29 09:39:39 -0700 |
| commit | d0ed2560ab7cd0960bc0245f633ed40f3939c6f1 (patch) | |
| tree | 05add7e741bcd84b1fb1c074c7fbf855dd7d696c | |
| parent | 27754e170b951c07ac8a395b316f3a5baedee2f3 (diff) | |
| download | pandoc-d0ed2560ab7cd0960bc0245f633ed40f3939c6f1.tar.gz | |
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.
| -rw-r--r-- | windows/pandoc.wxs | 11 |
1 files changed, 11 insertions, 0 deletions
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" /> |