From 1cec33227dfd53318586975cc83a61950d47303c Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 10 Sep 2014 11:51:48 +0300 Subject: [PATCH] install.run: don't overwrite existing ~/.oiden... ...td.conf --- .install.MKAYSIGREP.run | 4 +++- install.run | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.install.MKAYSIGREP.run b/.install.MKAYSIGREP.run index c3b07186..182f0709 100755 --- a/.install.MKAYSIGREP.run +++ b/.install.MKAYSIGREP.run @@ -3,7 +3,9 @@ cat .bash_aliases.MKAYSIGREP > ~/.bash_aliases cat .zsh_aliases.MKAYSIGREP > ~/.zsh_aliases cat .gitconfig.MKAYSIGREP > ~/.gitconfig -cat oidentd.conf > ~/.oidentd.conf +if [ ! -f ~/.oidentd.conf ]; then + cat oidentd.conf > ~/.oidentd.conf +fi mkdir -p ~/.gnupg cat sks-keyservers.netCA.pem > ~/.gnupg/sks-keyservers.netCA.pem cat .gpg.conf.MKAYSIGREP > ~/.gnupg/gpg.conf diff --git a/install.run b/install.run index 10b3ffc2..0ad9f7d4 100755 --- a/install.run +++ b/install.run @@ -5,7 +5,9 @@ cat tmux.conf > ~/.tmux.conf cat zshrc > ~/.zshrc cat gitconfig > ~/.gitconfig cat vimrc > ~/.vimrc -cat oidentd.conf > ~/.oidentd.conf +if [ ! -f ~/.oidentd.conf ]; then + cat oidentd.conf > ~/.oidentd.conf +fi mkdir -p ~/.gnupg cat gpg.conf > ~/.gnupg/gpg.conf cat gpg-agent.conf > ~/.gnupg/gpg-agent.conf