diff --git a/ui/app/routes/onboarding/install/index.ts b/ui/app/routes/onboarding/install/index.ts index 517bd306285..6b19c757660 100644 --- a/ui/app/routes/onboarding/install/index.ts +++ b/ui/app/routes/onboarding/install/index.ts @@ -1,24 +1,24 @@ import Route from '@ember/routing/route'; -// import { UAParser } from 'ua-parser-js'; +import { UAParser } from 'ua-parser-js'; export default class OnboardingInstallIndex extends Route { - // redirect() { - // const parser = new UAParser(); - // - // switch (parser.getResult().os.name) { - // case 'Mac OS': - // return this.transitionTo('onboarding.install.homebrew'); - // case 'Windows': - // return this.transitionTo('onboarding.install.chocolatey'); - // case 'Debian': - // case 'Ubuntu': - // return this.transitionTo('onboarding.install.linux.ubuntu'); - // case 'CentOS': - // return this.transitionTo('onboarding.install.linux.centos'); - // case 'Fedora': - // return this.transitionTo('onboarding.install.linux.fedora'); - // default: - // return this.transitionTo('onboarding.install.manual'); - // } - // } + redirect() { + const parser = new UAParser(); + + switch (parser.getResult().os.name) { + case 'Mac OS': + return this.transitionTo('onboarding.install.homebrew'); + case 'Windows': + return this.transitionTo('onboarding.install.chocolatey'); + case 'Debian': + case 'Ubuntu': + return this.transitionTo('onboarding.install.linux.ubuntu'); + case 'CentOS': + return this.transitionTo('onboarding.install.linux.centos'); + case 'Fedora': + return this.transitionTo('onboarding.install.linux.fedora'); + default: + return this.transitionTo('onboarding.install.manual'); + } + } } diff --git a/ui/app/templates/onboarding/install.hbs b/ui/app/templates/onboarding/install.hbs index 6d8534dbfc2..7bfb431324d 100644 --- a/ui/app/templates/onboarding/install.hbs +++ b/ui/app/templates/onboarding/install.hbs @@ -2,37 +2,57 @@

Install the Waypoint CLI

-

First, you'll need to install the Waypoint CLI.

+

First, you'll need to install the Waypoint CLI via Homebrew or a manual installation.

-
-

Waypoint uses both a client and a server to build, deploy, and release applications. Anyone using Waypoint to - deploy from their workstation will need to install Waypoint locally.

- -

Download the binary

- -

To install Waypoint, find the appropriate package for your system and download the zip archive.

- -

- - {{inline-svg "download" class="icon"}} - Download - -

+
-

After downloading Waypoint, unzip the downloaded archive. Waypoint runs as a single binary named - waypoint. It is recommended that you move it to a directory in your PATH - to allow you to execute it from any directory. +

+

Anyone using Waypoint to deploy from their workstation needs to install it locally. The below + instructions guide you through that for various operating systems.

-

For example:

-

- $ mv ~/Downloads/waypoint /usr/local/bin/ -

-

Note: Due to the Waypoint beta currently being private, Homebrew, Linux packages, and Chocolatey - installation methods are not yet available. -

+

Install Waypoint

+ + + + {{outlet}} + +

Verify the installation

+ +

After installing Waypoint, verify that the installation worked by opening a new terminal session and running the + command waypoint.

+ + + 
waypoint
+ + + 
usage: waypoint [-version] [-help] [-autocomplete-(un)install] <command> [<args>]
+
+Common commands:
+    build        Build a new versioned artifact from source.
+    deploy       Deploy a pushed artifact.
+  ...
+ +

If you get an error that waypoint could not be found, your PATH environment variable was + not set up properly. Make sure that your PATH variable contains the directory where you installed + Waypoint.

diff --git a/ui/app/templates/onboarding/install/homebrew.hbs b/ui/app/templates/onboarding/install/homebrew.hbs index 9b6cb5530da..b6a74fd0e3a 100644 --- a/ui/app/templates/onboarding/install/homebrew.hbs +++ b/ui/app/templates/onboarding/install/homebrew.hbs @@ -1,4 +1,5 @@ -

Homebrew is a free and open-source package management system for Mac OS X. Install the official Waypoint formula from the terminal.

+

Homebrew is a free and open-source package management system for Mac OS X. Install the official Waypoint formula from the terminal.

brew install hashicorp/tap/waypoint
diff --git a/ui/app/templates/onboarding/install/manual.hbs b/ui/app/templates/onboarding/install/manual.hbs index 54aa5c2f706..9ebd29640ba 100644 --- a/ui/app/templates/onboarding/install/manual.hbs +++ b/ui/app/templates/onboarding/install/manual.hbs @@ -1,21 +1,15 @@ -

To install Waypoint, find the appropriate package for your system and download it. Waypoint is packaged as a zip archive.

- -

After downloading Waypoint, unzip the package. Waypoint runs as a single binary named waypoint. Any other files in the package can be safely removed and Waypoint will still function.

- -

Make sure that the waypoint binary is available on your PATH. You can check the locations available on your path by running this command.

- - - 
echo $PATH
- - -
/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
- -

The output is a list of locations separated by colons. You can make Waypoint available by moving the binary to one of the listed locations, or by adding Waypoint's location to your PATH.

- -
-

Tip (Linux-based or Mac): Permanently add a new location to your path by editing your shell's settings file (usually called something like ~/.bashrc, where the part of the file name after the . and before rc is the name of your shell). In that file you will see a line that starts with export PATH=, followed by a colon-separated list of locations. Add the location of the Waypoint binary to that list and save the file. Then reload your shell's configuration with the command source ~/.bashrc, replacing bash with the name of your shell.

-
- -
-

Tip (Windows): Add a location to your path via the GUI by navigating to Environment Variables in your system settings, and looking for the variable called PATH. You will see a semicolon-separated list of locations. Add the Waypoint binary's location to that list and then launch a new console window.

-
\ No newline at end of file +

To install Waypoint, find the appropriate package + for your system and download it. Waypoint is packaged as a zip archive.

+ +

After downloading Waypoint, unzip the downloaded archive. Waypoint runs as a single binary named + waypoint. It is recommended that you move it to a directory in your PATH + to allow you to execute it from any directory. +

+ +

For example:

+

+ $ mv ~/Downloads/waypoint /usr/local/bin/ +

+

Note: Due to the Waypoint beta currently being private, Homebrew, Linux packages, and Chocolatey + installation methods are not yet available. +

\ No newline at end of file