From ca57991b51ec5277fdcfa4d90b1f395e031668b8 Mon Sep 17 00:00:00 2001
From: YUKI Hiroshi <shimoda@clear-code.com>
Date: Tue, 16 Oct 2012 11:42:09 +0900
Subject: [PATCH] Use sed with options

---
 makexpi.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/makexpi.sh b/makexpi.sh
index 7c2afc5..932db25 100755
--- a/makexpi.sh
+++ b/makexpi.sh
@@ -105,14 +105,14 @@ fi
 
 if [ "$use_version" = '' ]
 then
-	use_version=`echo "$2" | sed -e 's#version=(1|yes|true)#1#ig'`
+	use_version=`echo "$2" | $sed -e 's#version=(1|yes|true)#1#ig'`
 fi
 
 
-version=`grep 'em:version=' install.rdf | sed -e 's#em:version=##g' | sed -e 's#[ \t\r\n"]##g'`
+version=`grep 'em:version=' install.rdf | $sed -e 's#em:version=##g' | $sed -e 's#[ \t\r\n"]##g'`
 if [ "$version" = '' ]
 then
-	version=`grep '<em:version>' install.rdf | sed -e 's#</?em:version>##g' | sed -e 's#[ \t\r\n"]##g'`
+	version=`grep '<em:version>' install.rdf | $sed -e 's#</?em:version>##g' | $sed -e 's#[ \t\r\n"]##g'`
 fi
 if [ "$version" != '' ]
 then
@@ -153,8 +153,8 @@ mv install.rdf ./install.rdf.base
 if [ "$min_version" != "0" ]
 then
   cat install.rdf.base \
-    | sed -e "s#<em:minVersion>.*</em:minVersion>#<em:minVersion>${min_version}</em:minVersion>#g" \
-          -e "s#em:minVersion=\(\".*\"\|'.*'\)#em:minVersion=\"${min_version}\"#g" \
+    | $sed -e "s#<em:minVersion>.*</em:minVersion>#<em:minVersion>${min_version}</em:minVersion>#g" \
+           -e "s#em:minVersion=\(\".*\"\|'.*'\)#em:minVersion=\"${min_version}\"#g" \
     > install.rdf
   rm install.rdf.base
   mv install.rdf ./install.rdf.base
@@ -162,8 +162,8 @@ fi
 if [ "$max_version" != "0" ]
 then
   cat install.rdf.base \
-    | sed -e "s#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>${max_version}</em:maxVersion>#g" \
-          -e "s#em:maxVersion=\(\".*\"\|'.*'\)#em:maxVersion=\"${max_version}\"#g" \
+    | $sed -e "s#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>${max_version}</em:maxVersion>#g" \
+           -e "s#em:maxVersion=\(\".*\"\|'.*'\)#em:maxVersion=\"${max_version}\"#g" \
     > install.rdf
   rm install.rdf.base
   mv install.rdf ./install.rdf.base
@@ -230,8 +230,8 @@ zip -r -$xpi_compression_level ../$appname${version_part}${suffix}.xpi $xpi_cont
 #create xpi without update info (Japanese)
 rm -f install.rdf
 cat install.rdf.base \
-  | sed -e "s#^.*<em:*\(updateURL\|updateKey\)>.*</em:*\(updateURL\|updateKey\)>##g" \
-        -e "s#^.*em:*\(updateURL\|updateKey\)=\(\".*\"\|'.*'\)##g" \
+  | $sed -e "s#^.*<em:*\(updateURL\|updateKey\)>.*</em:*\(updateURL\|updateKey\)>##g" \
+         -e "s#^.*em:*\(updateURL\|updateKey\)=\(\".*\"\|'.*'\)##g" \
   > install.rdf
 
 zip -r -$xpi_compression_level ../${appname}${version_part}${suffix}_noupdate.xpi $xpi_contents -x \*/.svn/\* || exit 1
@@ -258,7 +258,7 @@ then
 	zip -r -$xpi_compression_level ../${appname}${suffix}${version_part}_en.xpi $xpi_contents -x \*/.svn/\* || exit 1
 
 	rm -f install.rdf
-	sed -e "s#^.*<em:*\(updateURL\|updateKey\)>.*</em:*\(updateURL\|updateKey\)>##g" -e "s#^.*em:*\(updateURL\|updateKey\)=\(\".*\"\|'.*'\)##g" ../install.rdf > install.rdf
+	$sed -e "s#^.*<em:*\(updateURL\|updateKey\)>.*</em:*\(updateURL\|updateKey\)>##g" -e "s#^.*em:*\(updateURL\|updateKey\)=\(\".*\"\|'.*'\)##g" ../install.rdf > install.rdf
 	zip -r -$xpi_compression_level ../${appname}${suffix}${version_part}_noupdate_en.xpi $xpi_contents -x \*/.svn/\* || exit 1
 fi