Fixes lp1634405: welcome message juju-1 usage. #6487

Merged
merged 4 commits into from Oct 21, 2016

Conversation

Projects
None yet
4 participants
Member

anastasiamac commented Oct 21, 2016

No description provided.

cmd/juju/commands/main.go
+ On xenial/yakkety, use %s-default package install.
+ After the installation, you should have /usr/bin/%s directory to use '%s' command.
+
+`[1:], jujuversion.Current, ver, juju1xCmdName, juju1xCmdName, juju1xCmdName, juju1xCmdName, juju1xCmdName, juju1xCmdName, juju1xCmdName)
@wallyworld

wallyworld Oct 21, 2016

Owner

this is better done using a text template given the number of substitutions

@anastasiamac

anastasiamac Oct 21, 2016

Member

This is better done as user manual page. I've raised an issue.

@anastasiamac

anastasiamac Oct 21, 2016

Member

Changed my mind \o/ Updated to use template - it makes variable substitution more obvious as well!
Thank you for insisting!

See https://jujucharms.com/docs/stable/introducing-2 for more details.
+If you meant to use Juju 1.25.0, run 'juju' commands as 'juju-1'. For example, 'juju switch' as 'juju-1 switch'.
@wallyworld

wallyworld Oct 21, 2016

Owner

Shouldn't this be "1.25.6", or actually, "1.25.x" or something? 1.25.0 doesn't exist anymore

@anastasiamac

anastasiamac Oct 21, 2016

Member

This value is coming from jujuversion.Current which in tests is 1.25.0

@wallyworld

wallyworld Oct 21, 2016

Owner

doh of course, silly me

cmd/juju/commands/main_test.go
+ 'juju-1' command comes from juju-1-default package.
+ On trusty, use 'update-alternatives'.
+ On xenial/yakkety, use juju-1-default package install.
+ After the installation, you should have /usr/bin/juju-1 directory to use 'juju-1' command.
@wallyworld

wallyworld Oct 21, 2016

Owner

/usr/bin/juju-1 is not a directory but a binary executable, no?

@wallyworld

wallyworld Oct 21, 2016

Owner

Actually, it's a symlink, but the user would see it as a binary that they can run

@anastasiamac

anastasiamac Oct 21, 2016

Member

Removed word "directory" altogether. Still reads fine and I'd like to avoid confusion that may come with calling symlink binary or the other way around...

Member

anastasiamac commented Oct 21, 2016

$$merge$$

Contributor

jujubot commented Oct 21, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit e09500c into juju:develop Oct 21, 2016

1 check passed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy.
Details

@anastasiamac anastasiamac deleted the anastasiamac:fix-welcome-message-lp1634405 branch Oct 21, 2016

Owner

nskaggs commented Oct 21, 2016

@anastasiamac I still would like to see this line changed away from the switch command which is terribly confusing.

So instead of:
"If you meant to use Juju 1.25.0, run 'juju' commands as 'juju-1'. For example, 'juju switch' as 'juju-1 switch'."

Use the bootstrap command instead:

"If you meant to use Juju 1.25.0, run 'juju' commands as 'juju-1'. For example, 'juju bootstrap' as 'juju-1 bootstrap'."

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment