From 06ee35c444a9f26d4f73d8cdec59d5263e49359e Mon Sep 17 00:00:00 2001
From: linvi <linvi@users.noreply.github.com>
Date: Tue, 25 Jun 2019 13:43:21 +0100
Subject: [PATCH 1/3] Fix for connection of adb server not starting the right
 server

---
 src/adb/connection.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adb/connection.coffee b/src/adb/connection.coffee
index 03ba07b8..43967266 100644
--- a/src/adb/connection.coffee
+++ b/src/adb/connection.coffee
@@ -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 ' '}"

From cca933eb39112300357e98f9ac85971f040e3658 Mon Sep 17 00:00:00 2001
From: linvi <linvi@users.noreply.github.com>
Date: Tue, 25 Jun 2019 15:14:03 +0100
Subject: [PATCH 2/3] Added build script in package.json

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 08c0e2e7..a6f9a7ce 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "url": "https://github.com/openstf/adbkit.git"
   },
   "scripts": {
+    "build": "coffee -c -o lib src",
     "postpublish": "grunt clean",
     "prepublish": "grunt test coffee",
     "test": "grunt test"
@@ -61,4 +62,4 @@
   "engines": {
     "node": ">= 0.10.4"
   }
-}
+}
\ No newline at end of file

From 3580f89da8e29f9e567e8c2df5e3f1d014280c3b Mon Sep 17 00:00:00 2001
From: Thomas Imart <tiimart@amazon.com>
Date: Wed, 26 Jun 2019 14:58:48 +0100
Subject: [PATCH 3/3] updated package.json build script to reflect current
 build of adb-kit

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a6f9a7ce..6bfcc1bb 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -27,7 +28,7 @@
     "url": "https://github.com/openstf/adbkit.git"
   },
   "scripts": {
-    "build": "coffee -c -o lib src",
+    "build": "coffee -c --no-header -b -o lib src",
     "postpublish": "grunt clean",
     "prepublish": "grunt test coffee",
     "test": "grunt test"