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>
Torsten Bögershausen committed
Jan 1, 2013 at 22:40 UTC
6f4e5059a06ced70456c2523e4fd85db5ffcdc45
1 file changed
+14
-10
t/t9810-git-p4-rcs.sh
+14
-10
@@ -26,10 +26,8 @@ test_expect_success 'init depot' '
26
line7
27
line8
28
EOF
29
- cp filek fileko &&
30
- sed -i "s/Revision/Revision: do not scrub me/" fileko
31
- cp fileko file_text &&
32
- sed -i "s/Id/Id: do not scrub me/" file_text
29
+ sed "s/Revision/Revision: do not scrub me/" <filek >fileko &&
30
+ sed "s/Id/Id: do not scrub me/" <fileko >file_text &&
31
p4 add -t text+k filek &&
32
p4 submit -d "filek" &&
33
p4 add -t text+ko fileko &&
@@ -88,7 +86,8 @@ test_expect_success 'edit far away from RCS lines' '
86
(
87
cd "$git" &&
88
git config git-p4.skipSubmitEdit true &&
91
- sed -i "s/^line7/line7 edit/" filek &&
89
+ sed "s/^line7/line7 edit/" <filek >filek.tmp &&
90
+ mv -f filek.tmp filek &&
91
git commit -m "filek line7 edit" filek &&
92
git p4 submit &&
93
scrub_k_check filek
@@ -105,7 +104,8 @@ test_expect_success 'edit near RCS lines' '
104
cd "$git" &&
105
git config git-p4.skipSubmitEdit true &&
106
git config git-p4.attemptRCSCleanup true &&
108
- sed -i "s/^line4/line4 edit/" filek &&
107
+ sed "s/^line4/line4 edit/" <filek >filek.tmp &&
108
+ mv -f filek.tmp filek &&
109
git commit -m "filek line4 edit" filek &&
110
git p4 submit &&
111
scrub_k_check filek
@@ -122,7 +122,8 @@ test_expect_success 'edit keyword lines' '
122
cd "$git" &&
123
git config git-p4.skipSubmitEdit true &&
124
git config git-p4.attemptRCSCleanup true &&
125
- sed -i "/Revision/d" filek &&
125
+ sed "/Revision/d" <filek >filek.tmp &&
126
+ mv -f filek.tmp filek &&
127
git commit -m "filek remove Revision line" filek &&
128
git p4 submit &&
129
scrub_k_check filek
@@ -139,7 +140,8 @@ test_expect_success 'scrub ko files differently' '
140
cd "$git" &&
141
git config git-p4.skipSubmitEdit true &&
142
git config git-p4.attemptRCSCleanup true &&
142
- sed -i "s/^line4/line4 edit/" fileko &&
143
+ sed "s/^line4/line4 edit/" <fileko >fileko.tmp &&
144
+ mv -f fileko.tmp fileko &&
145
git commit -m "fileko line4 edit" fileko &&
146
git p4 submit &&
147
scrub_ko_check fileko &&
@@ -189,12 +191,14 @@ test_expect_success 'do not scrub plain text' '
191
cd "$git" &&
192
git config git-p4.skipSubmitEdit true &&
193
git config git-p4.attemptRCSCleanup true &&
192
- sed -i "s/^line4/line4 edit/" file_text &&
194
+ sed "s/^line4/line4 edit/" <file_text >file_text.tmp &&
195
+ mv -f file_text.tmp file_text &&
196
git commit -m "file_text line4 edit" file_text &&
197
(
198
cd "$cli" &&
199
p4 open file_text &&
197
- sed -i "s/^line5/line5 p4 edit/" file_text &&
200
+ sed "s/^line5/line5 p4 edit/" <file_text >file_text.tmp &&
201
+ mv -f file_text.tmp file_text &&
202
p4 submit -d "file5 p4 edit"
203
) &&
204
echo s | test_expect_code 1 git p4 submit &&