|
2 | 2 | "use strict";
|
3 | 3 |
|
4 | 4 | import {SysInfoBase} from "./common/sys-info-base";
|
| 5 | +import * as path from "path"; |
5 | 6 |
|
6 | 7 | export class SysInfo extends SysInfoBase {
|
7 | 8 | constructor(protected $childProcess: IChildProcess,
|
8 | 9 | protected $hostInfo: IHostInfo,
|
9 | 10 | protected $iTunesValidator: Mobile.IiTunesValidator,
|
10 | 11 | protected $logger: ILogger,
|
| 12 | + protected $winreg: IWinReg, |
11 | 13 | private $androidToolsInfo: IAndroidToolsInfo) {
|
12 |
| - super($childProcess, $hostInfo, $iTunesValidator, $logger); |
| 14 | + super($childProcess, $hostInfo, $iTunesValidator, $logger, $winreg); |
13 | 15 | }
|
14 | 16 |
|
15 |
| - public getSysInfo(androidToolsInfo?: {pathToAdb: string, pathToAndroid: string}): IFuture<ISysInfoData> { |
| 17 | + public getSysInfo(pathToPackageJson: string, androidToolsInfo?: {pathToAdb: string, pathToAndroid: string}): IFuture<ISysInfoData> { |
16 | 18 | return ((): ISysInfoData => {
|
17 | 19 | let defaultAndroidToolsInfo = {
|
18 | 20 | pathToAdb: this.$androidToolsInfo.getPathToAdbFromAndroidHome().wait(),
|
19 | 21 | pathToAndroid: this.$androidToolsInfo.getPathToAndroidExecutable().wait()
|
20 | 22 | };
|
21 |
| - return super.getSysInfo(androidToolsInfo || defaultAndroidToolsInfo).wait(); |
| 23 | + return super.getSysInfo(pathToPackageJson || path.join(__dirname, "..", "package.json"), androidToolsInfo || defaultAndroidToolsInfo).wait(); |
22 | 24 | }).future<ISysInfoData>()();
|
23 | 25 | }
|
24 | 26 | }
|
|
0 commit comments