threads / patch / 32505

v2t9810: Do not use sed -i

Subject: [PATCH V2] t9810: Do not use sed -i

## tl;dr

4 messages between Jan 1, 2013 and Jan 3, 2013. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Torsten Bögershausen· Jan 1, 2013, 23:20 UTC · lore

sed -i is not portable on all systems. Use sed with different input and output files. Utilize a tmp file whenever needed

Added missing && at 2 places

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
Changes since v1:
Use "sed <infile >outfile"
Added missing && at 2 places (thanks for catching)
 t/t9810-git-p4-rcs.sh | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

Show changes to t/t9810-git-p4-rcs.sh +14 −10

diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index 0c2fc3e..01a9921 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -26,10 +26,8 @@ test_expect_success 'init depot' '
 		line7
 		line8
 		EOF
-		cp filek fileko &&
-		sed -i "s/Revision/Revision: do not scrub me/" fileko
-		cp fileko file_text &&
-		sed -i "s/Id/Id: do not scrub me/" file_text
+		sed "s/Revision/Revision: do not scrub me/" <filek >fileko &&
+		sed "s/Id/Id: do not scrub me/" <fileko >file_text &&
 		p4 add -t text+k filek &&
 		p4 submit -d "filek" &&
 		p4 add -t text+ko fileko &&
@@ -88,7 +86,8 @@ test_expect_success 'edit far away from RCS lines' '
 	(
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
-		sed -i "s/^line7/line7 edit/" filek &&
+		sed "s/^line7/line7 edit/" <filek >filek.tmp &&
+		mv -f filek.tmp filek &&
 		git commit -m "filek line7 edit" filek &&
 		git p4 submit &&
 		scrub_k_check filek
@@ -105,7 +104,8 @@ test_expect_success 'edit near RCS lines' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "s/^line4/line4 edit/" filek &&
+		sed "s/^line4/line4 edit/" <filek >filek.tmp &&
+		mv -f filek.tmp filek &&
 		git commit -m "filek line4 edit" filek &&
 		git p4 submit &&
 		scrub_k_check filek
@@ -122,7 +122,8 @@ test_expect_success 'edit keyword lines' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "/Revision/d" filek &&
+		sed "/Revision/d" <filek >filek.tmp &&
+		mv -f filek.tmp filek &&
 		git commit -m "filek remove Revision line" filek &&
 		git p4 submit &&
 		scrub_k_check filek
@@ -139,7 +140,8 @@ test_expect_success 'scrub ko files differently' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "s/^line4/line4 edit/" fileko &&
+		sed <fileko "s/^line4/line4 edit/" >fileko.tmp &&
+		mv -f fileko.tmp fileko &&
 		git commit -m "fileko line4 edit" fileko &&
 		git p4 submit &&
 		scrub_ko_check fileko &&
@@ -189,12 +191,14 @@ test_expect_success 'do not scrub plain text' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "s/^line4/line4 edit/" file_text &&
+		sed "s/^line4/line4 edit/" <file_text >file_text.tmp &&
+		mv -f file_text.tmp file_text &&
 		git commit -m "file_text line4 edit" file_text &&
 		(
 			cd "$cli" &&
 			p4 open file_text &&
-			sed -i "s/^line5/line5 p4 edit/" file_text &&
+			sed "s/^line5/line5 p4 edit/" <file_text >file_text.tmp &&
+			mv -f file_text.tmp file_text &&
 			p4 submit -d "file5 p4 edit"
 		) &&
 		echo s | test_expect_code 1 git p4 submit &&

-- 
1.8.0.197.g5a90748

Pete Wyckoff· Jan 2, 2013, 22:44 UTC · re: Torsten Bögershausen · lore

Re: [PATCH V2] t9810: Do not use sed -i

tboegi@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:

Show 7 quoted lines

> sed -i is not portable on all systems.
> Use sed with different input and output files.
> Utilize a tmp file whenever needed
> 
> Added missing && at 2 places
> 
> Signed-off-by: Torsten Bögershausen <tboegi@web.de>

One more teensy fix is needed in this hunk, following Junio's comment about redirections going at the end:

Show 10 quoted lines

> @@ -139,7 +140,8 @@ test_expect_success 'scrub ko files differently' '
>  		cd "$git" &&
>  		git config git-p4.skipSubmitEdit true &&
>  		git config git-p4.attemptRCSCleanup true &&
> -		sed -i "s/^line4/line4 edit/" fileko &&
> +		sed <fileko "s/^line4/line4 edit/" >fileko.tmp &&
> +		mv -f fileko.tmp fileko &&
>  		git commit -m "fileko line4 edit" fileko &&
>  		git p4 submit &&
>  		scrub_ko_check fileko &&

I checked that the test still works with your changes.

Thanks for the cleanup!

Acked-by: Pete Wyckoff <pw@padd.com>

		-- Pete

Junio C Hamano· Jan 2, 2013, 23:06 UTC · re: Pete Wyckoff · lore

Re: [PATCH V2] t9810: Do not use sed -i

Pete Wyckoff <pw@padd.com> writes:

Show 11 quoted lines

> tboegi@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:
>> sed -i is not portable on all systems.
>> Use sed with different input and output files.
>> Utilize a tmp file whenever needed
>> 
>> Added missing && at 2 places
>> 
>> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
>
> One more teensy fix is needed in this hunk, following Junio's
> comment about redirections going at the end:

I've already pushed out the previous one on 'pu' after fixing it up like this.

Thanks.  Anything I missed?

Date: Tue, 1 Jan 2013 22:40:37 +0100
Subject: [PATCH] t9810: Do not use sed -i

sed -i is not portable on all systems. Use sed with different input and output files. Utilize a tmp file whenever needed.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t9810-git-p4-rcs.sh | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

Show changes to t/t9810-git-p4-rcs.sh +14 −10

diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index 0c2fc3e..34fbc90 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -26,10 +26,8 @@ test_expect_success 'init depot' '
 		line7
 		line8
 		EOF
-		cp filek fileko &&
-		sed -i "s/Revision/Revision: do not scrub me/" fileko
-		cp fileko file_text &&
-		sed -i "s/Id/Id: do not scrub me/" file_text
+		sed "s/Revision/Revision: do not scrub me/" <filek >fileko &&
+		sed "s/Id/Id: do not scrub me/" <fileko >file_text &&
 		p4 add -t text+k filek &&
 		p4 submit -d "filek" &&
 		p4 add -t text+ko fileko &&
@@ -88,7 +86,8 @@ test_expect_success 'edit far away from RCS lines' '
 	(
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
-		sed -i "s/^line7/line7 edit/" filek &&
+		sed "s/^line7/line7 edit/" <filek >filek.tmp &&
+		mv -f filek.tmp filek &&
 		git commit -m "filek line7 edit" filek &&
 		git p4 submit &&
 		scrub_k_check filek
@@ -105,7 +104,8 @@ test_expect_success 'edit near RCS lines' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "s/^line4/line4 edit/" filek &&
+		sed "s/^line4/line4 edit/" <filek >filek.tmp &&
+		mv -f filek.tmp filek &&
 		git commit -m "filek line4 edit" filek &&
 		git p4 submit &&
 		scrub_k_check filek
@@ -122,7 +122,8 @@ test_expect_success 'edit keyword lines' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "/Revision/d" filek &&
+		sed "/Revision/d" <filek >filek.tmp &&
+		mv -f filek.tmp filek &&
 		git commit -m "filek remove Revision line" filek &&
 		git p4 submit &&
 		scrub_k_check filek
@@ -139,7 +140,8 @@ test_expect_success 'scrub ko files differently' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "s/^line4/line4 edit/" fileko &&
+		sed "s/^line4/line4 edit/" <fileko >fileko.tmp &&
+		mv -f fileko.tmp fileko &&
 		git commit -m "fileko line4 edit" fileko &&
 		git p4 submit &&
 		scrub_ko_check fileko &&
@@ -189,12 +191,14 @@ test_expect_success 'do not scrub plain text' '
 		cd "$git" &&
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.attemptRCSCleanup true &&
-		sed -i "s/^line4/line4 edit/" file_text &&
+		sed "s/^line4/line4 edit/" <file_text >file_text.tmp &&
+		mv -f file_text.tmp file_text &&
 		git commit -m "file_text line4 edit" file_text &&
 		(
 			cd "$cli" &&
 			p4 open file_text &&
-			sed -i "s/^line5/line5 p4 edit/" file_text &&
+			sed "s/^line5/line5 p4 edit/" <file_text >file_text.tmp &&
+			mv -f file_text.tmp file_text &&
 			p4 submit -d "file5 p4 edit"
 		) &&
 		echo s | test_expect_code 1 git p4 submit &&

-- 
1.8.1.203.gc241474

Pete Wyckoff· Jan 3, 2013, 03:08 UTC · re: Junio C Hamano · lore

Re: [PATCH V2] t9810: Do not use sed -i

gitster@pobox.com wrote on Wed, 02 Jan 2013 15:06 -0800:

Show 18 quoted lines

> Pete Wyckoff <pw@padd.com> writes:
> 
> > tboegi@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:
> >> sed -i is not portable on all systems.
> >> Use sed with different input and output files.
> >> Utilize a tmp file whenever needed
> >> 
> >> Added missing && at 2 places
> >> 
> >> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
> >
> > One more teensy fix is needed in this hunk, following Junio's
> > comment about redirections going at the end:
> 
> I've already pushed out the previous one on 'pu' after fixing it up
> like this.
> 
> Thanks.  Anything I missed?

I should have guessed that you would just silently fix it. Thanks!

		-- Pete