Don't quote for uniqify and use 1 sed call instead of looping.

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 351430c01f04f87efc9cc3be511a27de34bfe866..f6fecff0503678650c2f0d72e7037dd6e8c00756 100644 (file)
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -23,19 +23,13 @@ build_resolv_conf()
        done
 
        # Build a search list
-       for x in ${interfaces}; do
-               x="${resolvconf_dir}/${x}"
-               search="${search}${search:+ }$(sed -n 's/^search //p' "${x}")"
-       done
-       [ -n "${search}" ] && search="search $(uniqify "${search}")\n"
+       search=$(cd "${resolvconf_dir}"; sed -n 's/^search //p' ${interfaces})
+       [ -n "${search}" ] && search="search $(uniqify ${search})\n"
 
        # Build a nameserver list
-       for x in ${interfaces}; do
-               x="${resolvconf_dir}/${x}"
-               srvs="${srvs}${srvs:+ }$(sed -n 's/^nameserver //p' "${x}")"
-       done
+       srvs=$(cd "${resolvconf_dir}"; sed -n 's/^nameserver //p' ${interfaces})
        if [ -n "${srvs}" ]; then
-               for x in $(uniqify "${srvs}"); do
+               for x in $(uniqify ${srvs}); do
                        servers="${servers}nameserver ${x}\n"
                done
        fi