|
309 | 309 | Value="[EASYRSA]" |
310 | 310 | Sequence="first">EASYRSA AND NOT Installed</SetProperty> |
311 | 311 |
|
312 | | - |
313 | | - <!-- |
314 | | - 1. Set log folder with registry folder if detected. |
315 | | - 2. Set log folder to the previous log folder if detected. Use README.txt file to detect previous log folder. |
316 | | - 3. Allow overriding log folder by specifying LOG=<folder> on the msiexec.exe command line. |
317 | | - --> |
318 | | - <Property Id="LOGDIRREG"> |
319 | | - <RegistrySearch Id="reg.log_dir" Root="HKLM" Key="SOFTWARE\$(var.PRODUCT_NAME)" Name="log_dir" Type="directory"/> |
320 | | - </Property> |
321 | | - <SetProperty |
322 | | - After="AppSearch" |
323 | | - Action="SetLogDirReg" |
324 | | - Id="LOGDIR" |
325 | | - Value="[LOGDIRREG]" |
326 | | - Sequence="first">LOGDIRREG AND NOT Installed</SetProperty> |
327 | | - <Property Id="LOGDIRPREV"> |
328 | | - <ComponentSearch Id="log.README.txt" Guid="{CD05C1F7-99E7-45C9-8DE5-9C7FB73EE911}"/> |
329 | | - </Property> |
330 | | - <SetProperty |
331 | | - After="SetLogDirReg" |
332 | | - Action="SetLogDirPrev" |
333 | | - Id="LOGDIR" |
334 | | - Value="[LOGDIRPREV]" |
335 | | - Sequence="first">LOGDIRPREV AND NOT Installed</SetProperty> |
336 | | - <SetProperty |
337 | | - After="SetLogDirPrev" |
338 | | - Action="SetLogDirParam" |
339 | | - Id="LOGDIR" |
340 | | - Value="[LOG]" |
341 | | - Sequence="first">LOG AND NOT Installed</SetProperty> |
342 | | - |
343 | | - |
344 | 312 | <!-- |
345 | 313 | 1. Set sample configuration folder to the previous sample configuration folder if detected. Use sample.ovpn file to detect previous sample configuration folder. |
346 | 314 | 2. Allow overriding sample configuration folder by specifying SAMPLECFG=<folder> on the msiexec.exe command line. |
|
671 | 639 | </Directory> |
672 | 640 | </Directory> |
673 | 641 |
|
674 | | - <Directory Id="LOGDIR" Name="log"> |
675 | | - <Component Id="log.README.txt" Guid="{CD05C1F7-99E7-45C9-8DE5-9C7FB73EE911}"> |
676 | | - <File Id="log.README.txt" Name="README.txt" Source="!(bindpath.build)README-log.txt"/> |
677 | | - </Component> |
678 | | - </Directory> |
679 | | - |
680 | 642 | <Directory Id="RESDIR" Name="res"> |
681 | 643 | <Component Id="res.ovpn.ico" Guid="{01C7FEE2-2F5B-4BBF-A7CF-7B7B5E2B44D2}"> |
682 | 644 | <File Id="res.ovpn.ico" Name="ovpn.ico" Source="artwork\ovpn.ico"/> |
|
702 | 664 | </Directory> |
703 | 665 | </Directory> |
704 | 666 |
|
| 667 | + <Directory Id="CommonAppDataFolder"> |
| 668 | + <Directory Id="ProgramDataFolder.OpenVPN" Name="$(var.PRODUCT_NAME)"> |
| 669 | + <Directory Id="LOGDIR" Name="Log"> |
| 670 | + <Component Id="log.README.txt" Guid="{CD05C1F7-99E7-45C9-8DE5-9C7FB73EE911}"> |
| 671 | + <File Id="log.README.txt" Name="README.txt" Source="!(bindpath.build)README-log.txt"/> |
| 672 | + </Component> |
| 673 | + </Directory> |
| 674 | + </Directory> |
| 675 | + </Directory> |
| 676 | + |
705 | 677 | <Directory Id="ProgramMenuFolder"> |
706 | 678 | <Directory Id="ProductShortcutFolder" Name="$(var.PRODUCT_NAME)"> |
707 | 679 | <Component Id="shortcut.openvpn_gui.exe" Guid="{EC5742CF-E221-497C-A411-6CF74A298612}"> |
|
0 commit comments