You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/05/24 20:31:37 UTC

[2/3] android commit: CB-3480: update now uses cordova.js not cordova-.js

CB-3480: update now uses cordova.js not cordova-<ver>.js


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

Branch: refs/heads/2.8.x
Commit: f64cd2ee8a0015f64108aa8dc5336e0483c238f4
Parents: aa81966
Author: David Kemp <dr...@chromium.org>
Authored: Thu May 23 11:55:05 2013 -0400
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 24 11:30:50 2013 -0700

----------------------------------------------------------------------
 bin/update |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f64cd2ee/bin/update
----------------------------------------------------------------------
diff --git a/bin/update b/bin/update
index 92ceda8..9a968b1 100755
--- a/bin/update
+++ b/bin/update
@@ -45,9 +45,9 @@ fi
 
 # cleanup after exit and/or on error
 function on_exit {
-    if [ -f "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js ]
+    if [ -f "$BUILD_PATH"/framework/assets/www/cordova.js ]
     then
-        rm "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js
+        rm "$BUILD_PATH"/framework/assets/www/cordova.js
     fi
     if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
     then
@@ -122,10 +122,10 @@ fi
 # copy cordova.js, cordova.jar and res/xml
 if [ -d "$BUILD_PATH"/framework ]
 then
-    cp "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+    cp "$BUILD_PATH"/framework/assets/www/cordova.js "$PROJECT_PATH"/assets/www/cordova.js
     cp "$BUILD_PATH"/framework/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
 else
-    cp "$BUILD_PATH"/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+    cp "$BUILD_PATH"/cordova.js "$PROJECT_PATH"/assets/www/cordova.js
     cp "$BUILD_PATH"/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
 fi