Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for connection of adb server not starting the right server #115

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for connection of adb server not starting the right server #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06ee35c
Fix for connection of adb server not starting the right server
linvi Jun 25, 2019
cca933e
Added build script in package.json
linvi Jun 25, 2019
3580f89
updated package.json build script to reflect current build of adb-kit
Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "adbkit",
"version": "2.11.1",
"version": "2.11.2",
"versionComment": "This is a custom version of the library",
"description": "A pure Node.js client for the Android Debug Bridge.",
"keywords": [
"adb",
Expand All @@ -27,6 +28,7 @@
"url": "https://github.com/openstf/adbkit.git"
},
"scripts": {
"build": "coffee -c --no-header -b -o lib src",
"postpublish": "grunt clean",
"prepublish": "grunt test coffee",
"test": "grunt test"
Expand Down Expand Up @@ -61,4 +63,4 @@
"engines": {
"node": ">= 0.10.4"
}
}
}
2 changes: 1 addition & 1 deletion src/adb/connection.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Connection extends EventEmitter

startServer: (callback) ->
debug "Starting ADB server via '#{@options.bin} start-server'"
return this._exec ['start-server'], {}, callback
return this._exec ["-P #{@options.port}", "start-server"], {}, callback

_exec: (args, options, callback) ->
debug "CLI: #{@options.bin} #{args.join ' '}"
Expand Down