incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject [12/15] ios commit: [CB-1137] emulate and log script failure when launched from external working directory
Date Mon, 30 Jul 2012 19:58:36 GMT
[CB-1137] emulate and log script failure when launched from external working directory


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/cfa66b5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/cfa66b5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/cfa66b5b

Branch: refs/heads/master
Commit: cfa66b5b05ba0dd5f892c3706902343615b906e7
Parents: 9c97f68
Author: Shazron Abdullah <shazron@apache.org>
Authored: Wed Jul 25 17:33:22 2012 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Mon Jul 30 12:52:25 2012 -0700

----------------------------------------------------------------------
 bin/templates/project/cordova/emulate |    2 +-
 bin/templates/project/cordova/log     |    9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/cfa66b5b/bin/templates/project/cordova/emulate
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/emulate b/bin/templates/project/cordova/emulate
index 3822121..1bee7c6 100755
--- a/bin/templates/project/cordova/emulate
+++ b/bin/templates/project/cordova/emulate
@@ -51,7 +51,7 @@ fi
 # launch using ios-sim
 
 if which ios-sim >/dev/null; then
-    ios-sim launch $APP_PATH --stderr console.log --stdout console.log &
+    ios-sim launch $APP_PATH --stderr $CORDOVA_PATH/console.log --stdout $CORDOVA_PATH/console.log
&
 else
     echo -e '\033[31mError: ios-sim was not found. Please download, build and install version
1.4 or greater from https://github.com/phonegap/ios-sim into your path. Or "brew install ios-sim"
using homebrew: http://mxcl.github.com/homebrew/\033[m'; exit 1;
 fi

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/cfa66b5b/bin/templates/project/cordova/log
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/log b/bin/templates/project/cordova/log
index fd1261c..580d659 100755
--- a/bin/templates/project/cordova/log
+++ b/bin/templates/project/cordova/log
@@ -18,9 +18,6 @@
 # under the License.
 #
 
-# 
-# USAGE
-#
-#  ./log [path]
-#
-tail -f ${1:-".."}/console.log
+CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
+
+tail -f $CORDOVA_PATH/console.log


Mime
View raw message