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

Commit e1e815f

Browse files
Merge branch 'release' into vladimirov/merge-rel-in-master-pre0.10
Conflicts: commands/post-install.ts
2 parents 9be0d8c + e7a85ce commit e1e815f

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

helpers.ts

-3
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,13 @@ export function getPathToAdb(injector: IInjector): IFuture<string> {
116116
var logger: ILogger = injector.resolve("logger");
117117
var staticConfig: Config.IStaticConfig = injector.resolve("staticConfig");
118118

119-
var warningMessage = util.format("Unable to find adb in PATH. Default one from %s resources will be used.", staticConfig.CLIENT_NAME.toLowerCase());
120119
var proc = childProcess.spawnFromEvent("adb", ["version"], "exit", undefined, { throwError: false }).wait();
121120

122121
if(proc.stderr) {
123-
logger.warn(warningMessage);
124122
return staticConfig.adbFilePath;
125123
}
126124
} catch(e) {
127125
if(e.code === "ENOENT") {
128-
logger.warn(warningMessage);
129126
return staticConfig.adbFilePath;
130127
}
131128
}

mobile/android/android-device.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
3838
private static REFRESH_WEB_VIEW_INTENT_NAME = "com.telerik.RefreshWebView";
3939
private static CHANGE_LIVESYNC_URL_INTENT_NAME = "com.telerik.ChangeLiveSyncUrl";
4040
private static LIVESYNC_BROADCAST_NAME = "com.telerik.LiveSync";
41-
private static CHECK_LIVESYNC_INTENT_NAME = "com.telerik.IsLiveSyncSupported"
41+
private static CHECK_LIVESYNC_INTENT_NAME = "com.telerik.IsLiveSyncSupported";
4242

4343
private static ENV_DEBUG_IN_FILENAME = "envDebug.in";
4444
private static ENV_DEBUG_OUT_FILENAME = "envDebug.out";

0 commit comments

Comments
 (0)