diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-01-05 15:58:14 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-01-15 09:27:29 +0200 |
| commit | 57078aec62049ac08c5df94db06c79e956fd0eeb (patch) | |
| tree | c5b2801f47e03d3b94a714440249a779d9e87637 /doc | |
| parent | 20f354b38b83e4aab107b388fe3c5e2ccd878946 (diff) | |
Fix InstallIcons and CreateDesktopEntry operations usage as root
The operations write the output files to a valid, writable directory
value of XDG_DATA_HOME variable if set, otherwise defaulting to
"$HOME/.local/share". This follows the XDG Base Directory Specification
but misses the use case of system-wide installation: the XDG_DATA_HOME
should only contain base directory relative to which user specific data
files should be stored.
Prefer a predefined value "/usr/local/share" when launced as root or
the internal elevated admin rights handling is active. This should be
a sane and well known value for applications installed system-wide, and
should not conflict with files extracted by distribution's package
management system.
Task-number: QTIFW-2093
Change-Id: I96fab3367122e7df783697e07baeb71dfd9b3f0e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/operations.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/operations.qdoc b/doc/operations.qdoc index a01446a69..cec0dba40 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -162,7 +162,8 @@ If \c filename is absolute, the desktop entry is stored there. Otherwise, it is stored in the location specified in \c{$XDG_DATA_HOME/applications}, including the default path, - as defined by freedesktop.org. + as defined by freedesktop.org. For system-wide installations, + it is stored in \c {/usr/local/share/applications} instead. The key-value pairs are written to the file. @@ -172,8 +173,8 @@ \li "InstallIcons" \c directory \c [Vendorprefix] \li Installs the contents of \c directory into a location, as specified by freedesktop.org. That is, into - \c {$XDG_DATA_HOME/icons} or - \c {$HOME/.local/share/icons}. The files are removed from their initial + \c {$XDG_DATA_HOME/icons}, \c {$HOME/.local/share/icons} or + \c {/usr/local/share/icons}. The files are removed from their initial location. Make sure to add this operation after the operation that extracts the files from the archive. If you provide a \c Vendorprefix it replaces all characters up to the |