You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/06/11 02:15:20 UTC

[05/32] 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/ee58107c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ee58107c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ee58107c

Branch: refs/heads/3.0.0
Commit: ee58107caa1b0d8cda1db180cda1d0ac284d29fd
Parents: 01946dd
Author: David Kemp <dr...@chromium.org>
Authored: Thu May 23 11:55:05 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Thu May 23 12:20:15 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ee58107c/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