mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-11 12:34:16 +00:00
Code Activity

update submodule

Browse Source
This commit is contained in:
deadc0de6
2017-12-23 22:02:17 +01:00
parent 1bd5137ca7
commit f8f41bf63b
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -361,7 +361,7 @@ be executed.
If used as a submodule, update it with If used as a submodule, update it with
```bash ```bash
$ git submodule update --recursive --remote $ git submodule foreach git pull origin master
``` ```
Through pypi: Through pypi:
@@ -577,10 +577,7 @@ If you want to keep it as a submodule, simply do the following
$ cd <dotfiles-directory> $ cd <dotfiles-directory>
## get latest version of the submodule ## get latest version of the submodule
$ cd dotdrop/ $ git submodule foreach git pull origin master
$ git checkout master
$ git pull
$ cd ../
## update the bash script wrapper ## update the bash script wrapper
$ ./dotdrop/bootstrap.sh $ ./dotdrop/bootstrap.sh

7
dotdrop.sh
View File

@@ -24,12 +24,7 @@ sub="dotdrop"
# pivot # pivot
cd "${cur}" || { echo "Folder \"${cur}\" doesn't exist, aborting." && exit; } cd "${cur}" || { echo "Folder \"${cur}\" doesn't exist, aborting." && exit; }
# init/update the submodule # init/update the submodule
if [ -e ${sub} ]; then git submodule foreach git pull origin master
cd dotdrop
git checkout master
git pull
cd ..
fi
# launch dotdrop # launch dotdrop
PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop --cfg="${cfg}" "${args[@]}" PYTHONPATH=dotdrop python3 -m dotdrop.dotdrop --cfg="${cfg}" "${args[@]}"
# pivot back # pivot back

4
dotdrop/dotdrop.py
View File

@@ -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: If you want to keep it as a submodule (recommended), simply do the following:
First get the latest version of dotdrop: First get the latest version of dotdrop:
$ cd dotdrop $ git submodule foreach git pull origin master
$ git checkout master
$ git pull
And then re-run the bootstrap script to update \"dotdrop.sh\": And then re-run the bootstrap script to update \"dotdrop.sh\":
$ ./dotdrop/bootstrap.sh $ ./dotdrop/bootstrap.sh