scripts/config: use sed's POSIX interface
PATCH v3 1/1 scripts/config: use sed's POSIX interface
Script config' relies on extensions of GNU sed', and is thus not working on all Unixes:
- in-place edition of files (-i), which can be replaced with
a temporary file;
- extended-regexps (-r), which can be split into basic regexps;
- single-line calls to `a' command, while some implementations require a leading newline before the parameter.
Rewrite calls to `sed' to comply with POSIX interface, and move them to helper functions.
---
Changes v2 -> v3:
- Moved temporary files handling to txt_* helper functions.
- Removed useless trailing slash in sed's append command parameter.
- Edited commit message.
Changes v1 -> v2:
- ANSI C style quoting to produce newlines ($'\n') is replaced with printf's, not to introduce further dependency on bash.
- helper functions are introduced to wrap calls to `sed'.
scripts/config | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-)
scripts/config +41 -3
@@ -60,15 +60,52 @@ checkarg() { fi } +txt_append() { + local anchor="$1" + local insert="$2" + local infile="$3" + local tmpfile="$infile.swp" + + # sed append cmd: 'a\' + newline + text + newline + cmd="$(printf "a\\%b$insert" "\n")" + + sed -e "/$anchor/$cmd" "$infile" >"$tmpfile" + # replace original file with the edited one + mv "$tmpfile" "$infile" +} + +txt_subst() { + local before="$1" + local after="$2" + local infile="$3" + local tmpfile="$infile.swp" + + sed -e "s/$before/$after/" "$infile" >"$tmpfile" + # replace original file with the edited one + mv "$tmpfile" "$infile" +} + +txt_delete() { + local text="$1" + local infile="$2" + local tmpfile="$infile.swp" + + sed -e "/$text/d" "$infile" >"$tmpfile" + # replace original file with the edited one + mv "$tmpfile" "$infile" +} + set_var() { local name=$1 new=$2 before=$3 name_re="^($name=|# $name is not set)" before_re="^($before=|# $before is not set)" if test -n "$before" && grep -Eq "$before_re" "$FN"; then - sed -ri "/$before_re/a $new" "$FN" + txt_append "^$before=" "$new" "$FN" + txt_append "^# $before is not set" "$new" "$FN" elif grep -Eq "$name_re" "$FN"; then - sed -ri "s:$name_re.*:$new:" "$FN" + txt_subst "^$name=.*" "$new" "$FN" + txt_subst "^# $name is not set" "$new" "$FN" else echo "$new" >>"$FN" fi
@@ -77,7 +114,8 @@ set_var() { undef_var() { local name=$1 - sed -ri "/^($name=|# $name is not set)/d" "$FN" + txt_delete "^$name=" "$FN" + txt_delete "^# $name is not set" "$FN" } if [ "$1" = "--file" ]; then
Signature · 1 line
1.8.3.rc1.44.gb387c77.dirty
Clément, All,
On 2013-07-13 16:36 +0200, Clement Chauplannaz spake thusly:
Quoted 4 lines
Script
config' relies on extensions ofGNU sed', and is thus not working on all Unixes:
- in-place edition of files (-i), which can be replaced witha temporary file;
Quoted 8 lines
- extended-regexps (-r), which can be split into basic regexps;
- single-line calls to `a' command, while some implementations require a leading newline before the parameter.Rewrite calls to `sed' to comply with POSIX interface, and move them to helper functions.
Signed-off-by Clement Chauplannaz <[email protected]>
OK, I'm taking this in my -for-next branch. Thank you!
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'