cocoonjs - npm Package Compare versions

Comparing version 1.0.0-0.3.0 to 1.0.0-0.4.0

package.json

 {
   "name": "cocoonjs",
-  "version": "1.0.0-0.3.0",
+  "version": "1.0.0-0.4.0",
   "preferGlobal": "true",
@@ -5,0 +5,0 @@ "description": "CocoonJS command line tool",

RELEASENOTES.md

 # CocoonJS-cli Release Notes
 
+### 1.0.0-0.4.0 ()
+* Improved Webview+ installation method
+
 ### 1.0.0-0.3.0 ()
@@ -4,0 +7,0 @@ * checkRequirements() now uses the correct cordova-cli provided by getCordovaCMD()

src/lib/cordova/plugin.js

@@ -83,3 +83,3 @@ var shell 	= require('shelljs'),
 
-	command = (util.inWindows) ? "where android" : "which android";
+	command = (util.inWindows) ? "android --help" : "which android";
 	result 	= this._cmd.exec(command, options);
@@ -91,10 +91,17 @@ if(result.code !== 0){
 
-	command = (util.inWindows) ? "echo %ANDROID_HOME%" : "echo $ANDROID_HOME";
+	command = (util.inWindows) ? "set" : "echo $ANDROID_HOME";
 	result 	= this._cmd.exec(command, options);
-	if( (result.output.length < 2) ) {
-		util.log("Missing environment variable ANDROID_HOME. The ANDROID_HOME variable must exist and should point to your android SDK directory.");
-		return false;
+	if(util.inWindows){
+		if(result.output.indexOf("ANDROID_HOME") === -1){
+			util.log("Missing environment variable ANDROID_HOME. The ANDROID_HOME variable must exist and should point to your android SDK directory.");
+			return false;
+		}
+	}else{
+		if( (result.output.length < 2) ) {
+			util.log("Missing environment variable ANDROID_HOME. The ANDROID_HOME variable must exist and should point to your android SDK directory.");
+			return false;
+		}
 	}
 
-	command = (util.inWindows) ? "where javac" : "which javac";
+	command = (util.inWindows) ? "javac -help" : "which javac";
 	result 	= this._cmd.exec(command, options);
@@ -181,3 +188,3 @@ if(result.code !== 0){
 	}
-
+	util.log("Downloading Webview+...");
 	var plugin_result 	= this._cmd.exec("plugin add " + plugin.bundle_id);
@@ -209,3 +216,2 @@ if(plugin_result.code !== 0) {
 		util.errorLog("Cannot build Webview+ project");
-		this._cmd.exec("plugin rm " + plugin_id);
 		process.exit(release_result.code);
@@ -212,0 +218,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

29423

increased by1%

Lines of code

610

increased by1.16%

No dependency changes