mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-26 03:53:09 +08:00
CB-12895 : updated .eslintrc file in spec dir and set jasmine true and removed root is true
This commit is contained in:
parent
ac4ac935f6
commit
55d7cf3865
15
bin/templates/cordova/lib/check_reqs.js
vendored
15
bin/templates/cordova/lib/check_reqs.js
vendored
@ -109,12 +109,12 @@ module.exports.get_gradle_wrapper = function () {
|
||||
} else { ++i; }
|
||||
}
|
||||
} else if (module.exports.isWindows()) {
|
||||
|
||||
var result = child_process.spawnSync(path.join(__dirname,'getASPath.bat'));
|
||||
//console.log('result.stdout =' + result.stdout.toString());
|
||||
//console.log('result.stderr =' + result.stderr.toString());
|
||||
|
||||
if(result.stderr.toString().length > 0) {
|
||||
var result = child_process.spawnSync(path.join(__dirname, 'getASPath.bat'));
|
||||
// console.log('result.stdout =' + result.stdout.toString());
|
||||
// console.log('result.stderr =' + result.stderr.toString());
|
||||
|
||||
if (result.stderr.toString().length > 0) {
|
||||
var androidPath = path.join(process.env['ProgramFiles'], 'Android') + '/';
|
||||
if (fs.existsSync(androidPath)) {
|
||||
program_dir = fs.readdirSync(androidPath);
|
||||
@ -125,12 +125,11 @@ module.exports.get_gradle_wrapper = function () {
|
||||
} else { ++i; }
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// console.log('got android studio path from registry');
|
||||
// remove the (os independent) new line char at the end of stdout
|
||||
// add gradle to match the above.
|
||||
androidStudioPath = path.join(result.stdout.toString().split('\r\n')[0],'gradle');
|
||||
androidStudioPath = path.join(result.stdout.toString().split('\r\n')[0], 'gradle');
|
||||
}
|
||||
}
|
||||
|
||||
|
2
spec/.eslintrc.yml
Normal file
2
spec/.eslintrc.yml
Normal file
@ -0,0 +1,2 @@
|
||||
env:
|
||||
jasmine: true
|
@ -1,12 +0,0 @@
|
||||
env:
|
||||
jasmine: true
|
||||
root: true
|
||||
extends: semistandard
|
||||
rules:
|
||||
indent:
|
||||
- error
|
||||
- 4
|
||||
camelcase: off
|
||||
padded-blocks: off
|
||||
operator-linebreak: off
|
||||
no-throw-literal: off
|
@ -1,12 +0,0 @@
|
||||
env:
|
||||
jasmine: true
|
||||
root: true
|
||||
extends: semistandard
|
||||
rules:
|
||||
indent:
|
||||
- error
|
||||
- 4
|
||||
camelcase: off
|
||||
padded-blocks: off
|
||||
operator-linebreak: off
|
||||
no-throw-literal: off
|
Loading…
Reference in New Issue
Block a user