You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ni...@apache.org on 2017/07/28 12:01:29 UTC
android commit: CB-12453: Remove unnecessary double quotes from .bat
files which are the causes of crash if project path contains spaces
Repository: cordova-android
Updated Branches:
refs/heads/master 36d07d7a1 -> 2b53c98cf
CB-12453: Remove unnecessary double quotes from .bat files which are the causes of crash if project path contains spaces
this closes #362
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2b53c98c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2b53c98c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2b53c98c
Branch: refs/heads/master
Commit: 2b53c98cf585a2f82f9d94f9acc210f362c48f97
Parents: 36d07d7
Author: Nikita Matrosov <v-...@microsoft.com>
Authored: Fri Jul 28 14:23:53 2017 +0300
Committer: Nikita Matrosov <v-...@microsoft.com>
Committed: Fri Jul 28 14:23:53 2017 +0300
----------------------------------------------------------------------
bin/android_sdk_version.bat | 2 +-
bin/check_reqs.bat | 2 +-
bin/templates/cordova/lib/install-device.bat | 2 +-
bin/templates/cordova/lib/install-emulator.bat | 2 +-
bin/templates/cordova/lib/list-devices.bat | 2 +-
bin/templates/cordova/lib/list-emulator-images.bat | 2 +-
bin/templates/cordova/lib/list-started-emulators.bat | 2 +-
bin/templates/cordova/lib/start-emulator.bat | 2 +-
spec/e2e/helpers/projectActions.js | 5 ++---
9 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/android_sdk_version.bat
----------------------------------------------------------------------
diff --git a/bin/android_sdk_version.bat b/bin/android_sdk_version.bat
index 33a1fa2..a6bc104 100644
--- a/bin/android_sdk_version.bat
+++ b/bin/android_sdk_version.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0android_sdk_version"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'android_sdk_version' script in 'bin' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/check_reqs.bat
----------------------------------------------------------------------
diff --git a/bin/check_reqs.bat b/bin/check_reqs.bat
index cb2c6f5..846dfa1 100644
--- a/bin/check_reqs.bat
+++ b/bin/check_reqs.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0check_reqs"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'check_reqs' script in 'bin' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/templates/cordova/lib/install-device.bat
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/install-device.bat b/bin/templates/cordova/lib/install-device.bat
index ac7214a..109b470 100644
--- a/bin/templates/cordova/lib/install-device.bat
+++ b/bin/templates/cordova/lib/install-device.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0install-device"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'install-device' script in 'cordova\lib' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/templates/cordova/lib/install-emulator.bat
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/install-emulator.bat b/bin/templates/cordova/lib/install-emulator.bat
index 1ec6779..a28c23a 100644
--- a/bin/templates/cordova/lib/install-emulator.bat
+++ b/bin/templates/cordova/lib/install-emulator.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0install-emulator"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'install-emulator' script in 'cordova\lib' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/templates/cordova/lib/list-devices.bat
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/list-devices.bat b/bin/templates/cordova/lib/list-devices.bat
index c0bcdd9..ad5f03e 100644
--- a/bin/templates/cordova/lib/list-devices.bat
+++ b/bin/templates/cordova/lib/list-devices.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0list-devices"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'list-devices' script in 'cordova\lib' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/templates/cordova/lib/list-emulator-images.bat
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/list-emulator-images.bat b/bin/templates/cordova/lib/list-emulator-images.bat
index 661cbf9..616ffb7 100644
--- a/bin/templates/cordova/lib/list-emulator-images.bat
+++ b/bin/templates/cordova/lib/list-emulator-images.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0list-emulator-images"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'list-emulator-images' script in 'cordova\lib' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/templates/cordova/lib/list-started-emulators.bat
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/list-started-emulators.bat b/bin/templates/cordova/lib/list-started-emulators.bat
index a4e88f7..eed02a5 100644
--- a/bin/templates/cordova/lib/list-started-emulators.bat
+++ b/bin/templates/cordova/lib/list-started-emulators.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0list-started-emulators"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'list-started-emulators' script in 'cordova\lib' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/bin/templates/cordova/lib/start-emulator.bat
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/start-emulator.bat b/bin/templates/cordova/lib/start-emulator.bat
index 9329d95..6c237ea 100644
--- a/bin/templates/cordova/lib/start-emulator.bat
+++ b/bin/templates/cordova/lib/start-emulator.bat
@@ -18,7 +18,7 @@
@ECHO OFF
SET script_path="%~dp0start-emulator"
IF EXIST %script_path% (
- node "%script_path%" %*
+ node %script_path% %*
) ELSE (
ECHO.
ECHO ERROR: Could not find 'start-emulator' script in 'cordova\lib' folder, aborting...>&2
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b53c98c/spec/e2e/helpers/projectActions.js
----------------------------------------------------------------------
diff --git a/spec/e2e/helpers/projectActions.js b/spec/e2e/helpers/projectActions.js
index 4e3d8f2..9ac8936 100644
--- a/spec/e2e/helpers/projectActions.js
+++ b/spec/e2e/helpers/projectActions.js
@@ -45,7 +45,7 @@ module.exports.createProject = function (projectname, projectid, platformpath, c
module.exports.removeProject(projectid);
// create the project
- var command = util.format('%s %s %s "%s"', createScriptPath, projectDirName, projectid, projectname);
+ var command = util.format('"%s" %s %s "%s"', createScriptPath, projectDirName, projectid, projectname);
cp.exec(command, function (error, stdout, stderr) {
if (error) {
console.log(stdout);
@@ -69,8 +69,7 @@ module.exports.updateProject = function (projectid, platformpath, callback) {
}
var projectDirName = getDirName(projectid);
var updateScriptPath = platformpath ? path.join(platformpath, 'bin/update') : path.join(cordova_bin, 'update');
- var command = util.format('%s %s', updateScriptPath, projectDirName);
-
+ var command = util.format('"%s" %s', updateScriptPath, projectDirName);
cp.exec(command, function (error, stdout, stderr) {
if (error) {
console.log(stdout);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org