diff --git a/README.md b/README.md index 6c05fa7..f22877f 100644 --- a/README.md +++ b/README.md @@ -361,7 +361,7 @@ be executed. If used as a submodule, update it with ```bash -$ git submodule update --recursive --remote +$ git submodule foreach git pull origin master ``` Through pypi: @@ -577,10 +577,7 @@ If you want to keep it as a submodule, simply do the following $ cd ## get latest version of the submodule -$ cd dotdrop/ -$ git checkout master -$ git pull -$ cd ../ +$ git submodule foreach git pull origin master ## update the bash script wrapper $ ./dotdrop/bootstrap.sh diff --git a/dotdrop.sh b/dotdrop.sh index cccdcd1..f83cdd2 100755 --- a/dotdrop.sh +++ b/dotdrop.sh @@ -24,12 +24,7 @@ sub="dotdrop" # pivot cd "${cur}" || { echo "Folder \"${cur}\" doesn't exist, aborting." && exit; } # init/update the submodule -if [ -e ${sub} ]; then - cd dotdrop - git checkout master - git pull - cd .. -fi +git submodule foreach git pull origin master # launch dotdrop PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop --cfg="${cfg}" "${args[@]}" # pivot back diff --git a/dotdrop/dotdrop.py b/dotdrop/dotdrop.py index 024c270..9a8c8b5 100644 --- a/dotdrop/dotdrop.py +++ b/dotdrop/dotdrop.py @@ -20,9 +20,7 @@ the way it needs to be called has slightly changed. If you want to keep it as a submodule (recommended), simply do the following: First get the latest version of dotdrop: - $ cd dotdrop - $ git checkout master - $ git pull + $ git submodule foreach git pull origin master And then re-run the bootstrap script to update \"dotdrop.sh\": $ ./dotdrop/bootstrap.sh