From: EinvalSledge@gmail.com <EinvalSledge@gmail.com@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Fri, 15 Jun 2012 23:00:22 +0000 (+0000)
Subject: For safety across different systems, avoid using "sed -i".
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/0c00a676eab39e7d209c526a93c82b108c8f3d0d

For safety across different systems, avoid using "sed -i".
Closes issue 66.


git-svn-id: http://abcde.googlecode.com/svn/trunk@348 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---

diff --git a/abcde b/abcde
index 56b0a64..5c15c2c 100755
--- a/abcde
+++ b/abcde
@@ -2282,9 +2282,11 @@ do_cdtext ()
 		TRACKM1=$(($TRACK - 1))
 		TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")"
 		echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
-		sed -i "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1"
+		sed "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new"
+        mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1"
 	done
-	sed -i "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1"
+	sed "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new"
+    mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1"
 	echo >> "$ABCDETEMPDIR/cddbchoices"
 	echo "cdtext-readcomplete" >> "$ABCDETEMPDIR/status"
 }
diff --git a/changelog b/changelog
index b1fb954..b7874e7 100644
--- a/changelog
+++ b/changelog
@@ -22,6 +22,8 @@ abcde 2.5.3 UNRELEASED
   * Change cddb-tool to use bash to make sure that echo -n works.
     Closes issue 67.
   * Fixes for lots of spelling mistakes from vskytta. Closes issue 68.
+  * For safety across different systems, avoid using "sed -i".
+    Closes issue 66.
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 30 Apr 2012 16:59:14 +0100