<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Thu, Mar 24, 2016 at 10:49 AM Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Use 'sort --unique' to combine the two lists and remove duplicates.<br>
<br>
Signed-off-by: Andre McCurdy <<a href="mailto:armccurdy@gmail.com" target="_blank">armccurdy@gmail.com</a>><br>
---<br>
scripts/oe-buildenv-internal | 23 +++--------------------<br>
1 file changed, 3 insertions(+), 20 deletions(-)<br>
<br>
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal<br>
index 8eee008..be212f2 100755<br>
--- a/scripts/oe-buildenv-internal<br>
+++ b/scripts/oe-buildenv-internal<br>
@@ -110,29 +110,12 @@ unset BITBAKEDIR newpath<br>
export BUILDDIR<br>
export PATH<br>
<br>
-add_extrawhite() {<br>
- # If the current shell is zsh, then temporarily set it to emulate sh in this<br>
- # function so that the for and case statements below work as expected.<br>
- [ -z "$ZSH_NAME" ] || emulate -L sh<br>
-<br>
- local extrawhite="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \<br>
+BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \<br>
HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \<br>
all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \<br>
SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \<br>
SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"<br>
<br>
- local var<br>
- for var in $extrawhite; do<br>
- case " $BB_ENV_EXTRAWHITE " in<br>
- *[[:blank:]]$var[[:blank:]]*)<br>
- ;;<br>
- *)<br>
- BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE:+$BB_ENV_EXTRAWHITE }$var"<br>
- ;;<br>
- esac<br>
- done<br>
-}<br>
-<br>
-add_extrawhite<br>
-unset -f add_extrawhite<br>
+BB_ENV_EXTRAWHITE=$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | sed 's/ /\n/g' | LC_ALL=C sort --unique)<br></blockquote><div><br></div><div>You could use this instead of sed here: tr ' ' '\n'</div></div></div>