Merge 9a53936 into 81bddcd

bin/cli

@@ -4,11 +4,11 @@
 
 console.error('%s%s',
   'Warning: The `hsd cli` interface is deprecated.\n',
-  'Please use `hsd-cli` ($ npm install hs-client).');
+  'Please use `hsd-cli` and `hsw-cli`.\n');
 
 if (process.argv.length > 2 && process.argv[2] === 'wallet') {
   process.argv.splice(2, 1); // Evil hack.
-  require('hs-client/bin/hsw-cli');
+  require('./hsw-cli');
 } else {
-  require('hs-client/bin/hsd-cli');
+  require('./hsd-cli');
 }

bin/hsd-rpc

@@ -1,23 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env node
 
-# NOTE: This is part of generated `hs-client`.
-
-rl=0
-
-if ! type perl > /dev/null 2>& 1; then
-  if uname | grep -i 'darwin' > /dev/null; then
-    echo 'hsd-rpc requires perl to start on OSX.' >& 2
-    exit 1
-  fi
-  rl=1
-fi
-
-if test $rl -eq 1; then
-  file=$(readlink -f "$0")
-else
-  file=$(perl -MCwd -e "print Cwd::realpath('$0')")
-fi
-
-dir=$(dirname "$file")
-
-exec "${dir}/hsd-cli" rpc "$@"
+// insert `rpc` as first argument
+process.argv.splice(2, 0, 'rpc');
+require('./hsd-cli');

bin/hsw-rpc

@@ -1,23 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env node
 
-# NOTE: This is part of generated `hs-client`.
-
-rl=0
-
-if ! type perl > /dev/null 2>& 1; then
-  if uname | grep -i 'darwin' > /dev/null; then
-    echo 'hsw-rpc requires perl to start on OSX.' >& 2
-    exit 1
-  fi
-  rl=1
-fi
-
-if test $rl -eq 1; then
-  file=$(readlink -f "$0")
-else
-  file=$(perl -MCwd -e "print Cwd::realpath('$0')")
-fi
-
-dir=$(dirname "$file")
-
-exec "${dir}/hsw-cli" rpc "$@"
+// insert `rpc` as first argument
+process.argv.splice(2, 0, 'rpc');
+require('./hsw-cli');