From e018cde3976eb4809514f17528fdfe995780a526 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 20 Sep 2018 14:51:38 +0200 Subject: [PATCH] update doc on updating dotdrop when used as a submodule --- README.md | 9 +++++++-- dotdrop.sh | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b14836f..d3cf0e8 100644 --- a/README.md +++ b/README.md @@ -478,13 +478,18 @@ Also `compare` won't work on dotfiles using transformations. If used as a submodule, update it with ```bash -$ git submodule foreach git pull origin master +$ git submodule update --init --recursive +$ git submodule update --remote dotdrop +``` + +You will then need to commit the changes with +```bash $ git add dotdrop $ git commit -m 'update dotdrop' $ git push ``` -Through pypi: +Or if installed through pypi: ```bash $ sudo pip3 install dotdrop --upgrade ``` diff --git a/dotdrop.sh b/dotdrop.sh index 8dac199..1db8b11 100755 --- a/dotdrop.sh +++ b/dotdrop.sh @@ -25,6 +25,7 @@ sub="dotdrop" cd "${cur}" || { echo "Directory \"${cur}\" doesn't exist, aborting." && exit; } # init/update the submodule git submodule update --init --recursive +git submodule update --remote dotdrop # launch dotdrop PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop "${args[@]}" # pivot back