move instruments-client into bin/ and rename helpfully

bin/instruments-client.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 
 var net = require('net')

instruments/client_bin.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-var client  = require('./client.js');
-
-var args = client.parser.parseArgs();
-client.connect(args.result, args.socket);

lib/uiauto/bootstrap.js

@@ -1,5 +1,5 @@
 #import "lib/console.js"
-#import "lib/instruments_client.js"
+#import "lib/instruments_client_launcher.js"
 #import "appium/base.js"
 
 // automation globals

lib/uiauto/lib/instruments_client_launcher.js

@@ -100,7 +100,7 @@ var globalPath = (function() {
 
 // figure out where instruments client is (relative to where appium is run)
 var clientPath = (function() {
-  var client = 'instruments/client.js';
+  var client = 'bin/instruments-client.js';
   var module = 'node_modules/appium/';
 
   try {
@@ -112,7 +112,7 @@ var clientPath = (function() {
       return module + client;
     } catch(e) {
       if (globalPath === null) {
-        console.log("WARNING: could not find instruments/client.js in its " +
+        console.log("WARNING: could not find bin/instruments-client.js in its " +
                     "usual place, and global instruments_client not around " +
                     "either. This could cause problems");
       }

package.json

@@ -26,7 +26,7 @@
   "main": "./lib/server/main.js",
   "bin": {
     "appium": "./bin/appium.js",
-    "instruments_client": "./instruments/client_bin.js",
+    "instruments_client": "./bin/instruments-client.js",
     "authorize_ios": "./bin/authorize-ios.js"
   },
   "directories": {