You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/07/11 23:10:51 UTC
android commit: CB-1031 android create script fails
Updated Branches:
refs/heads/master b486711d6 -> 0ccd11e58
CB-1031 android create script fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/0ccd11e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/0ccd11e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/0ccd11e5
Branch: refs/heads/master
Commit: 0ccd11e587020084f6c3566dab7120e1a9f687b4
Parents: b486711
Author: Anis Kadri <an...@gmail.com>
Authored: Wed Jul 11 14:00:42 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Wed Jul 11 14:00:42 2012 -0700
----------------------------------------------------------------------
bin/create | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/0ccd11e5/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index 688b5fd..a12a715 100755
--- a/bin/create
+++ b/bin/create
@@ -63,6 +63,19 @@ function on_error {
[ -d $PROJECT_PATH ] && rm -rf $PROJECT_PATH
}
+function replace {
+ local pattern=$1
+ local filename=$2
+ # Mac OS X requires -i argument
+ if [ $OSTYPE = 'darwin11' ]
+ then
+ sed -i '' -e $pattern $filename
+ elif [ $OSTYPE = 'linux-gnu' ]
+ then
+ sed -i -e $pattern $filename
+ fi
+}
+
# we do not want the script to silently fail
trap on_error ERR
trap on_exit EXIT
@@ -116,12 +129,12 @@ fi
# interpolate the activity name and package
cp $BUILD_PATH/bin/templates/project/Activity.java $ACTIVITY_PATH
-sed -i '' -e "s/__ACTIVITY__/${ACTIVITY}/g" $ACTIVITY_PATH
-sed -i '' -e "s/__ID__/${PACKAGE}/g" $ACTIVITY_PATH
+replace "s/__ACTIVITY__/${ACTIVITY}/g" $ACTIVITY_PATH
+replace "s/__ID__/${PACKAGE}/g" $ACTIVITY_PATH
cp $BUILD_PATH/bin/templates/project/AndroidManifest.xml $MANIFEST_PATH
-sed -i '' -e "s/__ACTIVITY__/${ACTIVITY}/g" $MANIFEST_PATH
-sed -i '' -e "s/__PACKAGE__/${PACKAGE}/g" $MANIFEST_PATH
+replace "s/__ACTIVITY__/${ACTIVITY}/g" $MANIFEST_PATH
+replace "s/__PACKAGE__/${PACKAGE}/g" $MANIFEST_PATH
# creating cordova folder and copying emulate/debug/log/launch scripts
mkdir $PROJECT_PATH/cordova