mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-04 18:34:48 +00:00
Proofread docs
This commit is contained in:
@@ -2,14 +2,14 @@
|
||||
|
||||
Installing dotdrop [as a submodule](#as-a-submodule) is the recommended way.
|
||||
|
||||
If you want to keep your python environment clean, use the virtualenv installation instructions
|
||||
If you want to keep your Python environment clean, use the virtualenv installation instructions
|
||||
(see [As a submodule in a virtualenv](#as-a-submodule-in-a-virtualenv) and
|
||||
[Pypi package in a virtualenv](#pypi-package-in-a-virtualenv)).
|
||||
[PyPI package in a virtualenv](#pypi-package-in-a-virtualenv)).
|
||||
In that case, the virtualenv environment might need to be loaded before any attempt to use dotdrop.
|
||||
|
||||
## As a submodule
|
||||
|
||||
The following will create a git repository for your dotfiles and
|
||||
The following will create a Git repository for your dotfiles and
|
||||
keep dotdrop as a submodule:
|
||||
```bash
|
||||
## create the repository
|
||||
@@ -25,15 +25,15 @@ $ ./dotdrop/bootstrap.sh
|
||||
$ ./dotdrop.sh --help
|
||||
```
|
||||
|
||||
For MacOS users, make sure to install `realpath` through homebrew
|
||||
For macOS users, make sure to install `realpath` through Homebrew
|
||||
(part of *coreutils*).
|
||||
|
||||
Using this solution will need you to work with dotdrop by
|
||||
Using this solution will require you to work with dotdrop by
|
||||
using the generated script `dotdrop.sh` at the root
|
||||
of your dotfiles repository.
|
||||
|
||||
To ease the use of dotdrop, it is recommended to add an alias to it in your
|
||||
shell with the config file path, for example
|
||||
shell with the config file path; for example:
|
||||
```
|
||||
alias dotdrop=<absolute-path-to-dotdrop.sh> --cfg=<path-to-your-config.yaml>'
|
||||
```
|
||||
@@ -58,7 +58,7 @@ $ ./dotdrop/bootstrap.sh
|
||||
$ ./dotdrop.sh --help
|
||||
```
|
||||
|
||||
When using a virtualenv, make sure to source the environment before using dotdrop
|
||||
When using a virtualenv, make sure to source the environment before using dotdrop:
|
||||
```bash
|
||||
$ source env/bin/activate
|
||||
$ ./dotdrop.sh --help
|
||||
@@ -66,18 +66,18 @@ $ ./dotdrop.sh --help
|
||||
|
||||
Then follow the instructions under [As a submodule](#as-a-submodule).
|
||||
|
||||
## Pypi package
|
||||
## PyPI package
|
||||
|
||||
Install dotdrop
|
||||
Install dotdrop:
|
||||
```bash
|
||||
$ pip3 install dotdrop --user
|
||||
```
|
||||
|
||||
and then [setup your repository](repository-setup.md).
|
||||
and then [set up your repository](repository-setup.md).
|
||||
|
||||
## Pypi package in a virtualenv
|
||||
## PyPI package in a virtualenv
|
||||
|
||||
Install dotdrop in a virtualenv from pypi
|
||||
Install dotdrop from PyPI in a virtualenv:
|
||||
```bash
|
||||
$ virtualenv -p python3 env
|
||||
$ source env/bin/activate
|
||||
@@ -91,14 +91,14 @@ $ source env/bin/activate
|
||||
$ dotdrop --help
|
||||
```
|
||||
|
||||
Then follow the instructions under [Pypi package](#pypi-package).
|
||||
Then follow the instructions under [PyPI package](#pypi-package).
|
||||
|
||||
## Aur packages
|
||||
|
||||
Dotdrop is available on aur:
|
||||
|
||||
* stable: <https://aur.archlinux.org/packages/dotdrop/>
|
||||
* git version: <https://aur.archlinux.org/packages/dotdrop-git/>
|
||||
* Stable: <https://aur.archlinux.org/packages/dotdrop/>
|
||||
* Git version: <https://aur.archlinux.org/packages/dotdrop-git/>
|
||||
|
||||
Make sure to install the [python-magic-ahupp](https://aur.archlinux.org/packages/python-magic-ahupp/) from aur.
|
||||
|
||||
@@ -106,16 +106,16 @@ Then follow the [doc to setup your repository](repository-setup.md).
|
||||
|
||||
## Snap package
|
||||
|
||||
Dotdrop is available as a snap package: <https://snapcraft.io/dotdrop>
|
||||
Dotdrop is available as a snap package: <https://snapcraft.io/dotdrop>.
|
||||
|
||||
Install it with
|
||||
Install it with:
|
||||
```bash
|
||||
snap install dotdrop
|
||||
```
|
||||
|
||||
Then follow the [doc to setup your repository](repository-setup.md).
|
||||
|
||||
If you encounter warnings like `Warning: using regular magic file`
|
||||
If you encounter warnings like `Warning: using regular magic file`,
|
||||
try defining the following environment variable:
|
||||
```bash
|
||||
export MAGIC=$SNAP/usr/share/file/magic.mgc
|
||||
@@ -123,7 +123,7 @@ export MAGIC=$SNAP/usr/share/file/magic.mgc
|
||||
|
||||
## From source
|
||||
|
||||
Clone the repository
|
||||
Clone the repository:
|
||||
```bash
|
||||
$ git clone https://github.com/deadc0de6/dotdrop.git
|
||||
```
|
||||
@@ -138,14 +138,14 @@ $ ./dotdrop.sh --cfg <my-config-file> files
|
||||
|
||||
## Dependencies
|
||||
|
||||
Beside the python dependencies defined in [requirements.txt](https://github.com/deadc0de6/dotdrop/blob/master/requirements.txt),
|
||||
dotdrop depends on following tools:
|
||||
Beside the Python dependencies defined in [requirements.txt](https://github.com/deadc0de6/dotdrop/blob/master/requirements.txt),
|
||||
dotdrop depends on the following tools:
|
||||
|
||||
* `diff`
|
||||
* `git` (only if using the entry point script [dotdrop.sh](https://github.com/deadc0de6/dotdrop/blob/master/dotdrop.sh))
|
||||
* `readlink` or `realpath` (only if using the entry point script [dotdrop.sh](https://github.com/deadc0de6/dotdrop/blob/master/dotdrop.sh))
|
||||
|
||||
For MacOS users, make sure to install below packages through [homebrew](https://brew.sh/):
|
||||
For macOS users, make sure to install the below packages through [Homebrew](https://brew.sh/):
|
||||
|
||||
* [coreutils](https://formulae.brew.sh/formula/coreutils) (only if using the entry point script [dotdrop.sh](https://github.com/deadc0de6/dotdrop/blob/master/dotdrop.sh) which uses realpath)
|
||||
* [libmagic](https://formulae.brew.sh/formula/libmagic) (for python-magic)
|
||||
@@ -162,13 +162,13 @@ is auto-updated through the [dotdrop.sh](https://github.com/deadc0de6/dotdrop/bl
|
||||
script by defining the environment variable `DOTDROP_AUTOUPDATE=yes`.
|
||||
If undefined, `DOTDROP_AUTOUPDATE` will take the value `yes`.
|
||||
|
||||
If used as a submodule, update it with
|
||||
If used as a submodule, update it with:
|
||||
```bash
|
||||
$ git submodule update --init --recursive
|
||||
$ git submodule update --remote dotdrop
|
||||
```
|
||||
|
||||
You will then need to commit the changes with
|
||||
You will then need to commit the changes with:
|
||||
```bash
|
||||
$ git add dotdrop
|
||||
$ git commit -m 'update dotdrop'
|
||||
@@ -180,7 +180,7 @@ $ git push
|
||||
If you wish to get a specific version of dotdrop when using
|
||||
it as a submodule, the following operations can be done.
|
||||
|
||||
Here dotdrop is downgraded to the latest stable version
|
||||
Here dotdrop is downgraded to the latest stable version:
|
||||
```bash
|
||||
## enter the repository containing the dotdrop submodule
|
||||
$ cd my-dotfiles
|
||||
@@ -197,11 +197,9 @@ automatically update dotdrop back to the latest commit.
|
||||
|
||||
## Shell completion
|
||||
|
||||
Completion scripts exist for `bash`, `zsh` and `fish`,
|
||||
Completion scripts exist for `bash`, `zsh` and `fish`;
|
||||
see [the related doc](https://github.com/deadc0de6/dotdrop/blob/master/completion/README.md).
|
||||
|
||||
## Highlighters
|
||||
|
||||
Highlighters for dotdrop templates are available [here](https://github.com/deadc0de6/dotdrop/tree/master/highlighters).
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user