[Android] rename_package: use more osx compatible syntax

Rafaël Carré git at videolan.org
Fri Jan 31 09:16:45 CET 2014


vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 31 09:15:22 2014 +0100| [df584592c55fea02efb1c70a48f7ce19d48d45de] | committer: Rafaël Carré

rename_package: use more osx compatible syntax

add a suffix to -i
put filename as last argument
do not specify -r as we don't use extended regexps

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=df584592c55fea02efb1c70a48f7ce19d48d45de
---

 rename_package.sh |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rename_package.sh b/rename_package.sh
index 2c5d8fa..c6ea9d9 100755
--- a/rename_package.sh
+++ b/rename_package.sh
@@ -9,7 +9,7 @@ NEW_NAME=org.videolan.vlc.$1
 
 echo $NEW_NAME $2
 
-sed -i vlc-android/AndroidManifest.xml  -e "s/versionCode\(.*\)0\"/versionCode\1$2\"/"
+sed -i.orig -e "s/versionCode\(.*\)0\"/versionCode\1$2\"/" vlc-android/AndroidManifest.xml
 
 OLD_PATH=$(echo $OLD_NAME |sed 's/\./\//g')
 NEW_PATH=$(echo $NEW_NAME |sed 's/\./\//g')
@@ -18,8 +18,8 @@ mv vlc-android/src/${OLD_PATH} vlc-android/src/tmp
 mkdir -p vlc-android/src/${OLD_PATH}
 mv vlc-android/src/tmp vlc-android/src/${NEW_PATH}
 
-find vlc-android \( -name "*.xml" -o -name "*.java" -o -name "*.cfg" -o -name "*.aidl" \) -print0 | xargs -0 sed -ri "s/${OLD_NAME}/${NEW_NAME}/g"
-find vlc-android \( -name "*.c" \) -print0 | xargs -0 sed -ri "s,${OLD_PATH},${NEW_PATH},g"
-sed -ri "s,${OLD_PATH},${NEW_PATH},g" Makefile
+find vlc-android \( -name "*.xml" -o -name "*.java" -o -name "*.cfg" -o -name "*.aidl" \) -print0 | xargs -0 sed -i.orig "s/${OLD_NAME}/${NEW_NAME}/g"
+find vlc-android \( -name "*.c" \) -print0 | xargs -0 sed -i.orig "s,${OLD_PATH},${NEW_PATH},g"
+sed -i.orig "s,${OLD_PATH},${NEW_PATH},g" Makefile
 
-find vlc-android/jni -type f -print0 | xargs -0  sed -ri "s,$(echo $OLD_NAME |sed 's/\./_/g'),$(echo $NEW_NAME |sed 's/\./_/g'),g"
+find vlc-android/jni -type f -print0 | xargs -0  sed -i.orig "s,$(echo $OLD_NAME |sed 's/\./_/g'),$(echo $NEW_NAME |sed 's/\./_/g'),g"



More information about the Android mailing list