1 |
commit: f59ab2fc422dd6c8c2a07c4a89d3fae3f6aa2c69 |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 31 17:55:57 2015 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 31 17:55:57 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f59ab2fc |
7 |
|
8 |
safer quoting for clst_make_conf and proper quoting for "USE=${USE} bindist" |
9 |
|
10 |
prevent possible issues with spaces in $clst_make_conf |
11 |
|
12 |
prevent ${USE} being expanded by bash and causing the sed removal of |
13 |
USE="${USE} bindist" |
14 |
to fail |
15 |
|
16 |
targets/support/chroot-functions.sh | 4 ++-- |
17 |
1 file changed, 2 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
20 |
index 14a2e35..9066642 100755 |
21 |
--- a/targets/support/chroot-functions.sh |
22 |
+++ b/targets/support/chroot-functions.sh |
23 |
@@ -269,7 +269,7 @@ run_merge() { |
24 |
export CONFIG_PROTECT="-*" |
25 |
|
26 |
# Set bindist USE flag if clst_BINDIST is set |
27 |
- [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> ${clst_make_conf} |
28 |
+ [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}" |
29 |
|
30 |
if [ -n "${clst_VERBOSE}" ] |
31 |
then |
32 |
@@ -289,7 +289,7 @@ run_merge() { |
33 |
emerge ${clst_myemergeopts} $@ || exit 1 |
34 |
|
35 |
# Clean-up USE again |
36 |
- sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf} |
37 |
+ sed -i '/USE="${USE} bindist"/d' "${clst_make_conf}" |
38 |
} |
39 |
|
40 |
show_debug() { |