mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 19:09:44 +00:00
Code Activity

update issue with import and redirect to wiki

Browse Source
This commit is contained in:
deadc0de6
2018-04-10 22:59:52 +02:00
parent 3dc5813f66
commit c62449b92a
2 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
README.md
View File

@@ -200,7 +200,7 @@ $ dotdrop.sh --help
_ _ _
__| | ___ | |_ __| |_ __ ___ _ __
/ _` |/ _ \| __/ _` | '__/ _ \| '_ |
\__,_|\___/ \__\__,_|_| \___/| .__/
\__,_|\___/ \__\__,_|_| \___/| .__/
|_|
Usage:
@@ -358,7 +358,7 @@ Here's how to deploy the above solution:
```bash
./dotdrop.sh import ~/.secret
```
* encrypt the original dotfile
* encrypt the original dotfile
```bash
<some-gpg-command> ~/.secret
```
@@ -649,83 +649,7 @@ For more examples, see how people are using dotdrop:
# Related projects
These are some dotfiles related projects that
have inspired me for dotdrop:
* [https://github.com/EvanPurkhiser/dots](https://github.com/EvanPurkhiser/dots)
* [https://github.com/jaagr/dots](https://github.com/jaagr/dots)
* [https://github.com/anishathalye/dotbot](https://github.com/anishathalye/dotbot)
* [https://github.com/tomjnixon/Dotfiles](https://github.com/tomjnixon/Dotfiles)
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. That solution allows your dotfiles to be shipped along
with the tool able to handle them. Dotdrop is however also directly available
on pypi.
If you want to keep it as a submodule (recommended), simply do the following
```bash
$ cd <dotfiles-directory>
## get latest version of the submodule
$ git submodule foreach git pull origin master
## and stage the changes
$ git add dotdrop
$ git commit -m 'update dotdrop'
## update the bash script wrapper
$ ./dotdrop/bootstrap.sh
## and stage the change to the dotdrop.sh script
$ git add dotdrop.sh
$ git commit -m 'update dotdrop.sh'
## and finally push the changes upstream
$ git push
```
Otherwise, simply install it from pypi as explained [above](#with-pypi)
and get rid of the submodule as shown below:
* move to the dotfiles directory where dotdrop is used as a submodule
```bash
$ cd <dotfiles-repository>
```
* remove the entire `submodule "dotdrop"` section in `.gitmodules`
* stage the changes
```bash
$ git add .gitmodules
```
* remove the entire `submodule "dotdrop"` section in `.git/config`
* remove the submodule
```bash
$ git rm --cached dotdrop
```
* remove the submodule from .git
```bash
$ rm -rf .git/modules/dotdrop
```
* commit the changes
```bash
$ git commit -m 'removing dotdrop submodule'
```
* remove any remaining files from the dotdrop submodule
```bash
$ rm -rf dotdrop
```
* remove `dotdrop.sh`
```bash
$ git rm dotdrop.sh
$ git commit -m 'remove dotdrop.sh script'
```
* push upstream
```bash
$ git push
```
See [github does dotfiles](https://dotfiles.github.io/)
# Contribution

15
dotdrop/dotdrop.py
View File

@@ -17,20 +17,7 @@ except:
Dotdrop has been updated to be included in pypi and
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:
$ git submodule foreach git pull origin master
$ git add dotdrop
$ git commit -m 'update dotdrop'
And then re-run the bootstrap script to update \"dotdrop.sh\":
$ ./dotdrop/bootstrap.sh
$ git add dotdrop.sh
$ git commit -m 'update dotdrop.sh'
And finally push the changes upstream
$ git push
For more, see https://github.com/deadc0de6/dotdrop#migrate-from-submodule
See https://github.com/deadc0de6/dotdrop/wiki/migrate-from-submodule
'''
print(errmsg)
sys.exit(1)