diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2018-05-29 19:10:45 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2018-08-30 18:44:55 +0200 |
| commit | 4f487d6cc395f03963f4bb7a68bde985dd73b4a3 (patch) | |
| tree | 9b7c799c28a36119ae9726b26e3170cf0b994168 | |
| parent | gnome-shell-extensions.eselect: Do not call eval. (diff) | |
| download | eselect-4f487d6cc395f03963f4bb7a68bde985dd73b4a3.tar.gz eselect-4f487d6cc395f03963f4bb7a68bde985dd73b4a3.tar.bz2 eselect-4f487d6cc395f03963f4bb7a68bde985dd73b4a3.zip | |
wxwidgets.eselect: Fix libdir usage.
* modules/wxwidgets.eselect: Inherit multilib library (bug 552500).
(get_confdir): New function, outputs path of wx config dir.
(do_list, do_set, do_update): Use it.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | modules/wxwidgets.eselect | 12 |
2 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2018-05-29 Ulrich Müller <ulm@gentoo.org> + + * modules/wxwidgets.eselect: Inherit multilib library (bug 552500). + (get_confdir): New function, outputs path of wx config dir. + (do_list, do_set, do_update): Use it. + 2018-03-06 Ulrich Müller <ulm@gentoo.org> * modules/gnome-shell-extensions.eselect: Inherit tests library. diff --git a/modules/wxwidgets.eselect b/modules/wxwidgets.eselect index 55d49d2..b1abc1c 100644 --- a/modules/wxwidgets.eselect +++ b/modules/wxwidgets.eselect @@ -1,15 +1,18 @@ # -*-eselect-*- vim: ft=eselect -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit config +inherit config multilib DESCRIPTION="Manage the system default wxWidgets profile" MAINTAINER="wxwidgets@gentoo.org" VERSION="20140423" WXCONFFILE="${EROOT}"/var/lib/wxwidgets/current -WXCONFDIR="${EROOT}"/usr/lib/wx/config + +get_confdir() { + echo "${EROOT}/usr/$(get_libdir)/wx/config" +} find_targets() { local conf @@ -89,6 +92,7 @@ describe_list() { } do_list() { + local WXCONFDIR=$(get_confdir) local i targets currconf targets=( $(find_targets) ) [[ -e ${WXCONFFILE} ]] && currconf=$(load_config ${WXCONFFILE} WXCONFIG) @@ -123,6 +127,7 @@ do_set() { [[ ! -w "${EROOT}"/var/lib/ ]] \ && die -q "You need write permission to /var/lib to perform this action." + local WXCONFDIR=$(get_confdir) set_config "${1}" } @@ -133,6 +138,7 @@ describe_update() { do_update() { [[ ! -e ${WXCONFFILE} ]] && do_set none + local WXCONFDIR=$(get_confdir) currconf=$(load_config ${WXCONFFILE} WXCONFIG) # if current config is valid leave it alone |