1 |
commit: 6adf2b864fdbcb9cd57d427e6e411e6f09f83ef2 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 18 18:20:14 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 18 18:20:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/elfix.git/commit/?id=6adf2b86 |
7 |
|
8 |
scripts/paxmark.sh: source the profiles for PAX_MARKINGS |
9 |
|
10 |
Thanks chutzpah <AT> gentoo.org |
11 |
|
12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
13 |
|
14 |
scripts/paxmark.sh | 24 +++++++++++++++--------- |
15 |
1 file changed, 15 insertions(+), 9 deletions(-) |
16 |
|
17 |
diff --git a/scripts/paxmark.sh b/scripts/paxmark.sh |
18 |
index 6491af1..7fb0ead 100755 |
19 |
--- a/scripts/paxmark.sh |
20 |
+++ b/scripts/paxmark.sh |
21 |
@@ -86,15 +86,21 @@ paxmarksh() { |
22 |
return ${ret} |
23 |
} |
24 |
|
25 |
-MAKE_CONF="/etc/portage/make.conf" |
26 |
- |
27 |
-if [[ -d $MAKE_CONF ]]; then |
28 |
- for MC in $MAKE_CONF/*; do |
29 |
- source $MC |
30 |
- done |
31 |
-elif [[ -e $MAKE_CONF ]]; then |
32 |
- source $MAKE_CONF |
33 |
+if command -v portageq >/dev/null; then |
34 |
+ PAX_MARKINGS="$(portageq envvar PAX_MARKINGS)" |
35 |
fi |
36 |
|
37 |
-PAX_MARKINGS=${PAX_MARKINGS:="none"} |
38 |
+if [[ -z ${PAX_MARKINGS} ]]; then |
39 |
+ MAKE_CONF="/etc/portage/make.conf" |
40 |
+ |
41 |
+ if [[ -d ${MAKE_CONF} ]]; then |
42 |
+ for MC in "${MAKE_CONF}"/*; do |
43 |
+ source "${MC}" |
44 |
+ done |
45 |
+ elif [[ -r ${MAKE_CONF} ]]; then |
46 |
+ source "${MAKE_CONF}" |
47 |
+ fi |
48 |
+fi |
49 |
+ |
50 |
+: "${PAX_MARKINGS:="none"}" |
51 |
paxmarksh "$@" |