Skip to content

Commit

Permalink
fix(iedriver): if downloading x64, use x64 version on start command
Browse files Browse the repository at this point in the history
- clang formatting

closes #147
  • Loading branch information
cnishina committed Dec 13, 2016
1 parent 3bb22bf commit 31b572f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions lib/cmds/initialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,9 @@ export function android(
'android-sdk: Downloading more additional SDK updates ' +
'(this may take a while)');
return downloadAndroidUpdates(
sdkPath, ['build-tools-24.0.0'].concat(
getAndroidSDKTargets(apiLevels, architectures, platforms, oldAVDs)),
sdkPath,
['build-tools-24.0.0'].concat(
getAndroidSDKTargets(apiLevels, architectures, platforms, oldAVDs)),
true, acceptLicenses, verbose);
})
.then(() => {
Expand Down
3 changes: 2 additions & 1 deletion lib/cmds/opts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ opts[STARTED_SIGNIFIER] = new Option(
'A string to be outputted once the selenium server is up and running. Useful if you are writing a script which uses webdriver-manager.',
'string');
opts[SIGNAL_VIA_IPC] = new Option(
SIGNAL_VIA_IPC, 'If you are using --' + STARTED_SIGNIFIER +
SIGNAL_VIA_IPC,
'If you are using --' + STARTED_SIGNIFIER +
', this flag will emit the signal string using process.send(), rather than writing it to stdout',
'boolean', false);
opts[DETACH] = new Option(
Expand Down
5 changes: 2 additions & 3 deletions lib/cmds/start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ function start(options: Options) {
// https://bugs.openjdk.java.net/browse/JDK-6202721
args.push('-Djava.security.egd=file:///dev/./urandom');
}

if (options[Opt.LOGGING].getString()) {
if (path.isAbsolute(options[Opt.LOGGING].getString())) {
loggingFile = options[Opt.LOGGING].getString();
Expand All @@ -154,14 +153,14 @@ function start(options: Options) {
path.resolve(outputDir, binaries[GeckoDriver.id].executableFilename(osType)));
}
if (downloadedBinaries[IEDriver.id] != null) {
if (options[Opt.IE32]) {
if (options[Opt.IE32].getBoolean()) {
binaries[IEDriver.id].arch = 'Win32';
}
args.push(
'-Dwebdriver.ie.driver=' +
path.resolve(outputDir, binaries[IEDriver.id].executableFilename(osType)));
}
if (options[Opt.EDGE]) {
if (options[Opt.EDGE] && options[Opt.EDGE].getString()) {
// validate that the file exists prior to adding it to args
try {
let edgeFile = options[Opt.EDGE].getString();
Expand Down

0 comments on commit 31b572f

Please sign in to comment.