From 7727b4402e40e179c649516d69f294a3ddee1ba9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 9 Aug 2016 19:32:00 +0200 Subject: [PATCH] init-ifupdown: use [[:blank:]] posix expression instead of '\s' shorthand According to 'grep' manual '\s' is a synonym for [[:space:]] which matches spaces, TABs, but also newlines, etc. We want to only match spaces and TABs, so use [[:blank:]] instead. Signed-off-by: Javier Viguera --- .../init-ifupdown/init-ifupdown_1.0.bbappend | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 1cde43cfc..35acc7e94 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -50,34 +50,34 @@ do_install_append() { sed -i -e 's,##CELLULAR_INTERFACE##,${CELLULAR_INTERFACE},g' ${D}${sysconfdir}/network/interfaces if [ -n "${CELLULAR_APN}" ]; then - sed -i -e 's/^\(\s*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*apn/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*apn/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PIN}" ]; then - sed -i -e 's/^\(\s*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*pin/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*pin/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PORT}" ]; then - sed -i -e 's/^\(\s*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces sed -i -e 's,dhcp,manual,g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*port/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*port/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_USER}" ]; then - sed -i -e 's/^\(\s*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*user/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*user/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PASSWORD}" ]; then - sed -i -e 's/^\(\s*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*password/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*password/d' ${D}${sysconfdir}/network/interfaces fi fi