KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Docs: Unify and generalize the terms remote computer, machine and host

Browse Source
This commit is contained in:
pagedown 2022-03-22 23:26:15 +08:00
parent efda0ea455
commit ff8a99211d
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docs/kittens/ssh.rst
View File

@ -1,18 +1,18 @@
Truly convenient SSH Truly convenient SSH
========================================= =========================================
* Automatic :ref:`shell_integration` on remote machines * Automatic :ref:`shell_integration` on remote hosts
* Easily :ref:`clone local shell/editor config <real_world_ssh_kitten_config>` on remote machines * Easily :ref:`clone local shell/editor config <real_world_ssh_kitten_config>` on remote hosts
* Automatic :opt:`re-use of existing connections <kitten-ssh.share_connections>` to avoid connection setup latency * Automatic :opt:`re-use of existing connections <kitten-ssh.share_connections>` to avoid connection setup latency
The ssh kitten allows you to login easily to remote servers, and automatically The ssh kitten allows you to login easily to remote hosts, and automatically
setup the environment there to be as comfortable as your local shell. You setup the environment there to be as comfortable as your local shell. You
can specify environment variables to set on the remote server and can specify environment variables to set on the remote host and
files to copy there, making your remote experience just like your files to copy there, making your remote experience just like your
local shell. Additionally, it automatically sets up :ref:`shell_integration` on local shell. Additionally, it automatically sets up :ref:`shell_integration` on
the remote server and copies the kitty terminfo database there. the remote host and copies the kitty terminfo database there.
The ssh kitten is a thin wrapper around the traditional `ssh <https://man.openbsd.org/ssh>`__ The ssh kitten is a thin wrapper around the traditional `ssh <https://man.openbsd.org/ssh>`__
command line program and supports all the same options and arguments and configuration. command line program and supports all the same options and arguments and configuration.
@ -23,7 +23,7 @@ out, simply run:
kitty +kitten ssh some-hostname-to-connect-to kitty +kitten ssh some-hostname-to-connect-to
You should end up at a shell prompt on the remote server, with shell You should end up at a shell prompt on the remote host, with shell
integration enabled. If you like it you can add an alias to it in your shell's integration enabled. If you like it you can add an alias to it in your shell's
rc files: rc files:
@ -38,11 +38,11 @@ If you define a mapping in :file:`kitty.conf` such as::
map f1 new_window_with_cwd map f1 new_window_with_cwd
Then, pressing :kbd:`F1` will open a new window automatically logged Then, pressing :kbd:`F1` will open a new window automatically logged
into the same server using the ssh kitten, at the same directory. into the same host using the ssh kitten, at the same directory.
The ssh kitten can be configured using the :file:`~/.config/kitty/ssh.conf` The ssh kitten can be configured using the :file:`~/.config/kitty/ssh.conf`
file where you can specify environment variables to set on the remote server file where you can specify environment variables to set on the remote host
and files to copy from your local machine to the remote server. Let's see a and files to copy from the local to the remote host. Let's see a
quick example: quick example:
.. code-block:: conf .. code-block:: conf
@ -51,7 +51,7 @@ quick example:
copy .zshrc .vimrc .vim copy .zshrc .vimrc .vim
# Setup some environment variables # Setup some environment variables
env SOME_VAR=x env SOME_VAR=x
# COPIED_VAR will have the same value on the remote server as it does locally # COPIED_VAR will have the same value on the remote host as it does locally
env COPIED_VAR=_kitty_copy_env_var_ env COPIED_VAR=_kitty_copy_env_var_
# Create some per hostname settings # Create some per hostname settings
@ -117,7 +117,7 @@ How it works
The ssh kitten works by having SSH transmit and execute a POSIX sh (or The ssh kitten works by having SSH transmit and execute a POSIX sh (or
:opt:`optionally <kitten-ssh.interpreter>` Python) bootstrap script on the :opt:`optionally <kitten-ssh.interpreter>` Python) bootstrap script on the
remote server using an :opt:`interpreter <kitten-ssh.interpreter>`. This script remote host using an :opt:`interpreter <kitten-ssh.interpreter>`. This script
reads setup data over the tty device, which kitty sends as a base64 encoded reads setup data over the tty device, which kitty sends as a base64 encoded
compressed tarball. The script extracts it and places the :opt:`files <kitten-ssh.copy>` compressed tarball. The script extracts it and places the :opt:`files <kitten-ssh.copy>`
and sets the :opt:`environment variables <kitten-ssh.env>` before finally and sets the :opt:`environment variables <kitten-ssh.env>` before finally
@ -130,9 +130,9 @@ localhost by the kitten, the transmission is allowed. If your OpenSSH version is
.. note:: .. note::
When connecting to BSD servers, it is possible the bootstrap script will When connecting to BSD hosts, it is possible the bootstrap script will
fail or run slowly, because the default shells are crippled in various ways. fail or run slowly, because the default shells are crippled in various ways.
Your best bet is to install python on the server, make sure the login shell Your best bet is to install Python on the remote, make sure the login shell
is something POSIX sh compliant, and use :code:`python` as the :opt:`interpreter is something POSIX sh compliant, and use :code:`python` as the :opt:`interpreter
<kitten-ssh.interpreter>` in :file:`ssh.conf`. <kitten-ssh.interpreter>` in :file:`ssh.conf`.

4
kittens/ssh/copy.py
View File

@ -26,8 +26,8 @@ Interpret file arguments as glob patterns.
--dest --dest
The destination on the remote computer to copy to. Relative paths are resolved The destination on the remote host to copy to. Relative paths are resolved
relative to HOME on the remote machine. When this option is not specified, the relative to HOME on the remote host. When this option is not specified, the
local file path is used as the remote destination (with the HOME directory local file path is used as the remote destination (with the HOME directory
getting automatically replaced by the remote HOME). Note that environment getting automatically replaced by the remote HOME). Note that environment
variables and ~ are not expanded. variables and ~ are not expanded.

16
kittens/ssh/options/definition.py
View File

@ -8,10 +8,10 @@ from kitty.conf.types import Definition
copy_message = '''\ copy_message = '''\
Copy files and directories from the local computer to the remote one. The Copy files and directories from local to remote hosts. The specified files are
specified files are assumed to be relative to the HOME directory and copied assumed to be relative to the HOME directory and copied to the HOME on the
to the HOME on the server. Directories are copied recursively. If absolute paths remote. Directories are copied recursively. If absolute paths are used, they are
are used, they are copied as is.''' copied as is.'''
definition = Definition( definition = Definition(
'kittens.ssh', 'kittens.ssh',
@ -29,7 +29,7 @@ hosts can be used. Multiple hostnames can also be specified separated by spaces.
The hostname can include an optional username in the form :code:`user@host`. The hostname can include an optional username in the form :code:`user@host`.
When not specified options apply to all hosts, until the When not specified options apply to all hosts, until the
first hostname specification is found. Note that matching of hostname is done against first hostname specification is found. Note that matching of hostname is done against
the name you specify on the command line to connect to the remote computer. the name you specify on the command line to connect to the remote host.
If you wish to include the same basic configuration for many If you wish to include the same basic configuration for many
different hosts, you can do so with the :ref:`include <include>` directive. different hosts, you can do so with the :ref:`include <include>` directive.
''') ''')
@ -41,7 +41,7 @@ an alternate interpreter can be useful.
''') ''')
opt('remote_dir', '.local/share/kitty-ssh-kitten', option_type='relative_dir', long_text=''' opt('remote_dir', '.local/share/kitty-ssh-kitten', option_type='relative_dir', long_text='''
The location on the remote computer where the files needed for this kitten The location on the remote host where the files needed for this kitten
are installed. The location is relative to the HOME directory. Absolute paths or paths are installed. The location is relative to the HOME directory. Absolute paths or paths
that resolve to a location outside the HOME are not allowed. that resolve to a location outside the HOME are not allowed.
''') ''')
@ -51,7 +51,7 @@ opt('+copy', '', option_type='copy', add_to_default=False, long_text=f'''
copy .vimrc .zshrc .config/some-dir copy .vimrc .zshrc .config/some-dir
If a file should be copied to some other destination on the remote machine, If a file should be copied to some other destination on the remote host,
use :code:`--dest`:: use :code:`--dest`::
copy --dest some-other-name some-file copy --dest some-other-name some-file
@ -94,7 +94,7 @@ The value of MYVAR2 will be :code:`a/<path to home directory>/b`. Using
:code:`VAR=` will set it to the empty string and using just :code:`VAR` :code:`VAR=` will set it to the empty string and using just :code:`VAR`
will delete the variable from the child process' environment. The definitions will delete the variable from the child process' environment. The definitions
are processed alphabetically. The special value :code:`_kitty_copy_env_var_` are processed alphabetically. The special value :code:`_kitty_copy_env_var_`
will cause the value of the variable to be copied from the local machine. will cause the value of the variable to be copied from the local environment.
''') ''')
opt('cwd', '', long_text=''' opt('cwd', '', long_text='''