From 869826a8ac981dad5c3dfb8032e944cbb2ba8f9e Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sat, 23 Dec 2017 21:00:48 +0100 Subject: [PATCH] update readme --- README.md | 84 +++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 8f75d93..7c0df67 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,6 @@ why dotdrop rocks. There's two ways of installing and using dotdrop, either [as a submodule](#as-a-submodule) to your dotfiles git tree or system-wide [through pypi](#with-pypi). -For MacOS users, make sure to install `realpath` through homebrew -(part of *coreutils*). - ## With pypi Start by installing dotdrop @@ -98,7 +95,7 @@ $ git init To avoid the need to provide the config file path to dotdrop each time it is call, you can create an alias: ``` -alias dotdrop='cd && dotdrop' +alias dotdrop='dotdrop --cfg=' ``` Finally import your dotfiles as described [below](#usage). @@ -120,43 +117,17 @@ Then install the requirements: $ sudo pip3 install -r dotdrop/requirements.txt ``` +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 the generated script `dotdrop.sh` at the base +using the generated script `dotdrop.sh` at the root of your dotfiles repository. For any documentation below, simply replace the call to `dotdrop` by the bash script `dotdrop.sh`. Finally import your dotfiles as described [below](#usage). -## Migrate from submodule - -Initially dotdrop was used as a submodule directly in the -dotfiles git tree. It has since been packaged in pypi and -can thus be used directly. - -If you want to keep it as a submodule, simply do the following -```bash -$ cd - -## get latest version -$ git submodule update --init --recursive - -## update the bash script wrapper -$ ./dotdrop/bootstrap.sh -``` - -Otherwise, simply install it from pypi as explained [above](#with-pypi) -and get rid of the submodule: - -* move to the dotfiles directory where dotdrop is used as a submodule -* remove the entire `submodule "dotdrop"` section in `.gitmodules` -* stage the change with `git add .gitmodules` -* remove the entire `submodule "dotdrop"` section in `.git/config` -* remove the submodule with `git rm --cached dotdrop` -* remove the submodule from .git with `rm -rf .git/modules/dotdrop` -* commit the changes -* delete any remaining files from the dotdrop submodule with `rm -rf dotdrop` - # Usage If starting fresh, the `import` command of dotdrop @@ -212,7 +183,6 @@ For additional usage see the help: ``` $ dotdrop --help - _ _ _ __| | ___ | |_ __| |_ __ ___ _ __ / _` |/ _ \| __/ _` | '__/ _ \| '_ | @@ -220,17 +190,17 @@ $ dotdrop --help |_| Usage: - dotdrop install [-fndVc ] [--profile=] - dotdrop compare [-Vc ] [--profile=] [--files=] - dotdrop import [-ldVc ] [--profile=] ... - dotdrop listfiles [-Vc ] [--profile=] - dotdrop list [-Vc ] + dotdrop install [-fndV] [-c ] [-p ] + dotdrop compare [-V] [-c ] [-p ] [--files=] + dotdrop import [-ldV] [-c ] [-p ] ... + dotdrop listfiles [-V] [-c ] [-p ] + dotdrop list [-V] [-c ] dotdrop --help dotdrop --version Options: - --profile= Specify the profile to use [default: thor]. - -c --cfg= Path to the config [default: /home/drits/gits/github/dotdrop/config.yaml]. + -p --profile= Specify the profile to use [default: thor]. + -c --cfg= Path to the config [default: config.yaml]. --files= Comma separated list of files to compare. -n --nodiff Do not diff when installing. -l --link Import and link. @@ -591,6 +561,36 @@ have inspired me for dotdrop: See also [github does dotfiles](https://dotfiles.github.io/) +# Migrate from submodule + +Initially dotdrop was used as a submodule directly in the +dotfiles git tree. It has since been packaged in pypi and +can thus be used directly. + +If you want to keep it as a submodule, simply do the following +```bash +$ cd + +## get latest version +$ git submodule update --init --recursive + +## update the bash script wrapper +$ ./dotdrop/bootstrap.sh +``` + +Otherwise, simply install it from pypi as explained [above](#with-pypi) +and get rid of the submodule: + +* move to the dotfiles directory where dotdrop is used as a submodule +* remove the entire `submodule "dotdrop"` section in `.gitmodules` +* stage the change with `git add .gitmodules` +* remove the entire `submodule "dotdrop"` section in `.git/config` +* remove the submodule with `git rm --cached dotdrop` +* remove the submodule from .git with `rm -rf .git/modules/dotdrop` +* commit the changes +* delete any remaining files from the dotdrop submodule with `rm -rf dotdrop` + + # Contribution If you are having trouble installing or using dotdrop, open an issue.