Skip to content
This repository was archived by the owner on Feb 2, 2021. It is now read-only.

Commit 377c102

Browse files
Merge pull request #207 from telerik/vladimirov/merge-2-8-1
Merge release in master (for 2.8.1)
2 parents dc5e0f1 + 838cbb9 commit 377c102

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

mobile/mobile-core/device-discovery.ts

+9-3
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,28 @@ class IOSDeviceDiscovery extends DeviceDiscovery {
140140

141141
class IOSDeviceDiscoveryStub extends DeviceDiscovery {
142142
constructor(private $logger: ILogger,
143+
private $staticConfig: IStaticConfig,
143144
private error: string) {
144145
super();
145146
}
146147

147148
public startLookingForDevices(): IFuture<void> {
148-
this.$logger.warn(this.error);
149+
if(this.error) {
150+
this.$logger.warn(this.error);
151+
} else if(hostInfo.isLinux()) {
152+
this.$logger.warn("In this version of the %s command-line interface, you cannot use connected iOS devices.", this.$staticConfig.CLIENT_NAME);
153+
}
154+
149155
return Future.fromResult();
150156
}
151157
}
152158

153-
$injector.register("iOSDeviceDiscovery", ($errors: IErrors, $logger: ILogger, $fs: IFileSystem, $injector: IInjector, $iTunesValidator: Mobile.IiTunesValidator) => {
159+
$injector.register("iOSDeviceDiscovery", ($errors: IErrors, $logger: ILogger, $fs: IFileSystem, $injector: IInjector, $iTunesValidator: Mobile.IiTunesValidator, $staticConfig: IStaticConfig) => {
154160
var error = $iTunesValidator.getError().wait();
155161
var result: Mobile.IDeviceDiscovery = null;
156162

157163
if(error || hostInfo.isLinux()) {
158-
result = new IOSDeviceDiscoveryStub($logger, error);
164+
result = new IOSDeviceDiscoveryStub($logger, $staticConfig, error);
159165
} else {
160166
result = $injector.resolve(IOSDeviceDiscovery);
161167
}

0 commit comments

Comments
 (0)