summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-05-11 12:18:50 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-05-11 12:18:50 -0700
commitebb970def93d31f36ab4cc8f932428ff1bd2e176 (patch)
treea87c456d6e86b0534d5087a1839fb83fbf275c11
parent244f41ab85c33b8b9a2e756c1cd31f636e8c0f41 (diff)
downloaddotfiles-ebb970def93d31f36ab4cc8f932428ff1bd2e176.tar.gz
complete TODO: clean up .gnupg/ before stowing dotfiles
-rwxr-xr-xbin/insinuate-dotfiles1
-rw-r--r--home-mrconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/insinuate-dotfiles b/bin/insinuate-dotfiles
index 91e05916..583c66c8 100755
--- a/bin/insinuate-dotfiles
+++ b/bin/insinuate-dotfiles
@@ -14,7 +14,6 @@ status "trying to clone dotfiles to $1 using git daemon protocol"
# post-buster
# ssh "$1" 'wget -O- https://spwhitton.name/spwhitton.asc | gpg --import'
-# TODO this means that dotfiles won't stow because .gnupg/gpg.conf will exist
ssh "$1" 'cd $HOME && git clone --depth 1 git://spwhitton.name/dotfiles src/dotfiles'
diff --git a/home-mrconfig b/home-mrconfig
index f55bc49e..d56f3d77 100644
--- a/home-mrconfig
+++ b/home-mrconfig
@@ -207,6 +207,8 @@ fixups =
pre_stow =
homedir_mkdirs
$HOME/src/dotfiles/bin/unskel
+ # these will often end up created, e.g. by insinuate-dotfiles script
+ rm -f $HOME/.gnupg/{gpg.conf,gpg-agent.conf,dirmngr.conf,.gpg-v21-migrated}
# set up Emacs conf & libs
post_stow = $HOME/src/dotfiles/bin/bytecompile-emacsd