-
Notifications
You must be signed in to change notification settings - Fork 105
docs: fix terminal directives #2810
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jahn-junior
wants to merge
2
commits into
main
Choose a base branch
from
work/fix-terminal-directives
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,21 +53,12 @@ to `these instructions <https://brew.sh/>`_). | |
|
|
||
| brew install charmcraft | ||
|
|
||
| .. terminal:: | ||
|
|
||
| ==> Downloading https://ghcr.io/v2/homebrew/core/charmcraft/manifests/1.3.2 | ||
| ######################################################################## 100.0% | ||
| ==> Downloading https://ghcr.io/v2/homebrew/core/charmcraft/blobs/sha256:ebe7aac3dcfa401762faaf339a28e64bb5fb277a7d96bbcfb72bdc | ||
| ==> Downloading from https://pkg-containers.githubusercontent.com/ghcr1/blobs/sha256:ebe7aac3dcfa401762faaf339a28e64bb5fb277a7d | ||
| ######################################################################## 100.0% | ||
| ==> Pouring charmcraft--1.3.2.mojave.bottle.tar.gz | ||
| 🍺 /usr/local/Cellar/charmcraft/1.3.2: 2,205 files, 17.2MB | ||
|
|
||
| Charmhub commands work natively: | ||
|
|
||
| .. code-block:: bash | ||
| .. terminal:: | ||
|
|
||
| charmcraft whoami | ||
|
|
||
| name: John Doe | ||
| username: jdoe | ||
| id: xxxxxxxxxxxxxxxxxxxxxxxxx | ||
|
|
@@ -76,12 +67,10 @@ In macOS, Charmcraft defaults to Multipass to build the charms in a container ma | |
| the target bases. Running pack asks to setup Multipass if not already installed, and | ||
| continues with the packing process: | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| $ charmcraft pack | ||
|
|
||
| .. terminal:: | ||
|
|
||
| charmcraft pack | ||
|
|
||
| Multipass is required, but not installed. Do you wish to install Multipass and configure it with the defaults? [y/N]: y | ||
| ==> Downloading https://github.com/canonical/multipass/releases/download/v1.7.2/multipass-1.7.2+mac-Darwin.pkg | ||
| Already downloaded: /Users/jdoe/Library/Caches/Homebrew/downloads/4237fcef800faa84459a2911c3818dfa76f1532d693b151438f1c8266318715b--multipass-1.7.2+mac-Darwin.pkg | ||
|
|
@@ -119,11 +108,16 @@ a fresh new VM with 4 cores, 8GB RAM and a 20GB disk and the name ‘charm-dev': | |
|
|
||
| Last, open a shell in your new Ubuntu virtual machine, and install Charmcraft there: | ||
|
|
||
| .. code-block:: bash | ||
| .. terminal:: | ||
|
|
||
| multipass shell charm-dev | ||
| ... | ||
| ubuntu@charm-dev:~$ sudo snap install charmcraft --classic | ||
|
|
||
| .. terminal:: | ||
| :user: ubuntu | ||
| :host: charm-dev | ||
|
Comment on lines
+111
to
+117
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These will get merged into a single terminal session once we bump the sphinx-terminal version. |
||
|
|
||
| sudo snap install charmcraft --classic | ||
|
|
||
| charmcraft 2.2.0 from Canonical✓ installed | ||
|
|
||
| That's it. You can now start typing in Charmcraft commands. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.