From 1c76b8ea7be08498f82d44b049e78ca528173493 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Thu, 21 Apr 2016 19:11:33 +0100 Subject: [PATCH 1/2] sed: reword last example and add it to the osx version too --- pages/common/sed.md | 2 +- pages/osx/sed.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/common/sed.md b/pages/common/sed.md index 8594dcaf68..d507542a4c 100644 --- a/pages/common/sed.md +++ b/pages/common/sed.md @@ -22,6 +22,6 @@ `sed -e 's/{{find}}/{{replace}}/' -e 's/{{find}}/{{replace}}/' {{filename}}` -- Replace separator / by any other character not used in your string, e.g., #: +- Replace separator / by any other character not used in the find or replace patterns, e.g., #: `sed 's#{{find}}#{{replace}}#' {{filename}}` diff --git a/pages/osx/sed.md b/pages/osx/sed.md index 1dff7a6c66..cd00dd308e 100644 --- a/pages/osx/sed.md +++ b/pages/osx/sed.md @@ -21,3 +21,7 @@ - Apply multiple find-replace expressions to a file: `sed -e 's/{{find}}/{{replace}}/' -e 's/{{find}}/{{replace}}/' {{filename}}` + +- Replace separator / by any other character not used in the find or replace patterns, e.g., #: + +`sed 's#{{find}}#{{replace}}#' {{filename}}` From 685b6ea8bd99e71d1c645e5b9bc374d490022776 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Thu, 21 Apr 2016 19:13:01 +0100 Subject: [PATCH 2/2] sed: swap extended regex & line pattern examples --- pages/common/sed.md | 8 ++++---- pages/osx/sed.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pages/common/sed.md b/pages/common/sed.md index d507542a4c..72484c91e9 100644 --- a/pages/common/sed.md +++ b/pages/common/sed.md @@ -6,17 +6,17 @@ `sed 's/{{find}}/{{replace}}/' {{filename}}` -- Replace only on lines matching the line pattern: +- Replace all occurrences of an extended regular expression in a file: -`sed '/{{line_pattern}}/s/{{find}}/{{replace}}/'` +`sed -r 's/{{regex}}/{{replace}}/g' {{filename}}` - Replace all occurrences of a string in a file, overwriting the file (i.e. in-place): `sed -i 's/{{find}}/{{replace}}/g' {{filename}}` -- Replace all occurrences of an extended regular expression in a file: +- Replace only on lines matching the line pattern: -`sed -r 's/{{regex}}/{{replace}}/g' {{filename}}` +`sed '/{{line_pattern}}/s/{{find}}/{{replace}}/'` - Apply multiple find-replace expressions to a file: diff --git a/pages/osx/sed.md b/pages/osx/sed.md index cd00dd308e..81dc846c71 100644 --- a/pages/osx/sed.md +++ b/pages/osx/sed.md @@ -6,17 +6,17 @@ `sed 's/{{find}}/{{replace}}/' {{filename}}` -- Replace only on lines matching the line pattern: +- Replace all occurrences of an extended regular expression in a file: -`sed '/{{line_pattern}}/s/{{find}}/{{replace}}/'` +`sed -E 's/{{regex}}/{{replace}}/g' {{filename}}` - Replace all occurrences of a string in a file, overwriting the file (i.e. in-place): `sed -i '' 's/{{find}}/{{replace}}/g' {{filename}}` -- Replace all occurrences of an extended regular expression in a file: +- Replace only on lines matching the line pattern: -`sed -E 's/{{regex}}/{{replace}}/g' {{filename}}` +`sed '/{{line_pattern}}/s/{{find}}/{{replace}}/'` - Apply multiple find-replace expressions to a file: