Messages in this thread | | | From | Masahiro Yamada <> | Date | Mon, 13 Apr 2020 04:23:12 +0900 | Subject | Re: [PATCH] scripts/config: allow colons in option strings for sed |
| |
On Sat, Apr 11, 2020 at 1:58 AM Jeremie Francois (on alpha) <jeremie.francois@gmail.com> wrote: > > Sed broke on some strings as it used colon as a separator. > I made it more robust by using \001, which is legit POSIX AFAIK. > > E.g. ./config --set-str CONFIG_USBNET_DEVADDR "de:ad:be:ef:00:01" > failed with: sed: -e expression #1, char 55: unknown option to `s' > > Signed-off-by: Jeremie Francois (on alpha) <jeremie.francois@gmail.com> > --- > scripts/config | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/config b/scripts/config > index e0e39826dae9..d365081b60b2 100755 > --- a/scripts/config > +++ b/scripts/config > @@ -7,6 +7,9 @@ myname=${0##*/} > # If no prefix forced, use the default CONFIG_ > CONFIG_="${CONFIG_-CONFIG_}" > > +# We use an uncommon delimiter for sed substitutions > +SED_DELIM=$(echo -en "\001")
At first, 'echo -en' caught my eye, but this script is always run by bash. So, there is no portability issue here.
Applied to linux-kbuild. Thanks.
> + > usage() { > cat >&2 <<EOL > Manipulate options in a .config file from the command line. > @@ -83,7 +86,7 @@ txt_subst() { > local infile="$3" > local tmpfile="$infile.swp" > > - sed -e "s:$before:$after:" "$infile" >"$tmpfile" > + sed -e "s$SED_DELIM$before$SED_DELIM$after$SED_DELIM" "$infile" >"$tmpfile" > # replace original file with the edited one > mv "$tmpfile" "$infile" > } > -- > 2.17.1 >
-- Best Regards Masahiro Yamada
| |