docs(client): update docs with preferred deis CLI install method

Author: mboersma

client/README.rst

@@ -80,12 +80,15 @@ you used to provision the server. You can make a symlink or shell alias for
     $ deis
     Usage: deis <command> [<args>...]
 
-If you don't have Python_ installed, you can download a binary executable
-version of the Deis client for Mac OS X, Linux amd64, or Windows:
+If you don't have Python_, install the latest `deis` binary executable for
+Linux or Mac OS X with this command:
 
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-darwin.tgz
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-linux.tgz
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-win64.tgz
+.. code-block:: console
+
+    $ curl -sSL http://deis.io/deis-cli/install.sh | sh
+
+The installer puts `deis` in your current directory, but you should move it
+somewhere in your $PATH.
 
 
 2. `Register a User`_:

deisctl/README.md

@@ -12,8 +12,8 @@ To install the latest `deisctl` on Linux or Mac OS X, run this command:
 $ curl -sSL http://deis.io/deisctl/install.sh | sh
 ```
 
-The installer puts `deisctl` in */usr/local/bin* and downloads current Deis unit files
-to */var/lib/deis/units* one time.
+The installer puts `deisctl` in your current directory and downloads current Deis unit files
+to *$HOME/.deis/units* one time. You should move `deisctl` somewhere in your $PATH.
 
 To change installation options, save the installer directly from one of these links:
 

docs/installing_deis/register-admin-user.rst

@@ -24,13 +24,15 @@ you used to provision the server. You can make a symlink or shell alias for
     $ deis
     Usage: deis <command> [<args>...]
 
-If you don't have Python_ installed, you can download a binary executable
-version of the Deis client for Mac OS X, Linux amd64, or Windows:
+If you don't have Python_, install the latest `deis` binary executable for
+Linux or Mac OS X with this command:
 
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-darwin.tgz
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-linux.tgz
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-win64.tgz
+.. code-block:: console
+
+    $ curl -sSL http://deis.io/deis-cli/install.sh | sh
 
+The installer puts `deis` in your current directory, but you should move it
+somewhere in your $PATH.
 
 Register a User
 ---------------

docs/using_deis/install-client.rst

@@ -22,14 +22,15 @@ you used to provision the server. You can make a symlink or shell alias for
     $ deis
     Usage: deis <command> [<args>...]
 
-If you don't have Python_ installed, you can download a binary executable
-version of the Deis client for Mac OS X, Linux amd64, or Windows:
+If you don't have Python_, install the latest `deis` binary executable for
+Linux or Mac OS X with this command:
 
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-darwin.tgz
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-linux.tgz
-    - https://s3-us-west-2.amazonaws.com/opdemand/deis-0.13.0-dev-win64.tgz
+.. code-block:: console
+
+    $ curl -sSL http://deis.io/deis-cli/install.sh | sh
 
-Extract the ``deis`` binary and place it in your workstation path.
+The installer puts `deis` in your current directory, but you should move it
+somewhere in your $PATH.
 
 Proxy Support
 -------------

tests/bin/test-latest.sh

@@ -22,17 +22,22 @@ log_phase "Running test-latest on $DEIS_TEST_APP"
 
 log_phase "Installing clients"
 
-# FIXME: switch to deis CLI install from website
-make -C client build
+# install deis CLI from http://deis.io/ website
+pushd $DEIS_ROOT/deisctl
+curl -sSL http://deis.io/deis-cli/install.sh | sh -s v0.13.0-dev
+popd
 
-# install latest deisctl from the website
-curl -sSL http://deis.io/deisctl/install.sh | sh
+# install deisctl from http://deis.io/ website
+# installs latest unit files to $HOME/.deis/units
+pushd $DEIS_ROOT/client
+curl -sSL http://deis.io/deisctl/install.sh | sh -s v0.13.0-dev
+popd
 
 # ensure we use distributed unit files
 unset DEISCTL_UNITS
 
 # use the built client binaries
-export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
+export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client:$PATH
 
 log_phase "Provisioning 3-node CoreOS"