diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-06-08 09:13:11 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-06-13 10:09:56 +0200 |
| commit | 49a3ae2282a321412ede225fcd0fcba415deb480 (patch) | |
| tree | 788fe4b7738221a1ca25a14186a133231044aff0 /eclass | |
| parent | bash-completion-r1.eclass: Sanitize insopts (diff) | |
| download | gentoo-49a3ae2282a321412ede225fcd0fcba415deb480.tar.gz gentoo-49a3ae2282a321412ede225fcd0fcba415deb480.tar.bz2 gentoo-49a3ae2282a321412ede225fcd0fcba415deb480.zip | |
desktop.eclass: Sanitize insopts
Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/desktop.eclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass index d65b0d0bf074..91521b85a821 100644 --- a/eclass/desktop.eclass +++ b/eclass/desktop.eclass @@ -195,6 +195,7 @@ make_desktop_entry() { ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller + insopts -m 0644 insinto /usr/share/applications doins "${desktop}" ) || die "installing desktop file failed" @@ -228,6 +229,7 @@ make_session_desktop() { ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller + insopts -m 0644 insinto /usr/share/xsessions doins "${desktop}" ) @@ -243,6 +245,7 @@ domenu() { # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller local i j ret=0 + insopts -m 0644 insinto /usr/share/applications for i in "$@" ; do if [[ -f ${i} ]] ; then @@ -269,6 +272,7 @@ newmenu() { ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller + insopts -m 0644 insinto /usr/share/applications newins "$@" ) @@ -282,6 +286,7 @@ _iconins() { ( # wrap the env here so that the 'insinto' call # doesn't corrupt the env of the caller + insopts -m 0644 local funcname=$1; shift local size dir local context=apps |