X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=install;h=29727498284fdf9e8fcd02768090031f65a5e7d9;hb=6e14aad4dfbc43fd816f25f945f46636f7645522;hp=6f51c0b3afd3072ee78014d62a6aacac6ee8caa3;hpb=5223e76a4302c4de131593feea3987398c60445d;p=dotfiles.git

diff --git a/install b/install
index 6f51c0b..2972749 100755
--- a/install
+++ b/install
@@ -1,13 +1,18 @@
 #!/bin/bash
-cp -if `pwd`/.vimrc ~/.vimrc
-cp -if `pwd`/.bashrc ~/.bashrc
-cp -if `pwd`/.Xresources ~/.Xresources
-cp -if `pwd`/muttrc ~/.mutt/muttrc
-<<<<<<< HEAD
-cp -if `pwd`/msmtp ~/.mutt/msmtp
-cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc
-=======
-mkdir -p ~/.i3
-cp -if `pwd`/i3/* ~/.i3/
-cp -if `pwd`/.xinitrc ~/.xinitrc
->>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c
+
+cp -if `pwd`/.vimrc ~/.vimrc || true
+cp -if `pwd`/.bashrc ~/.bashrc || true
+cp -if `pwd`/muttrc ~/.mutt/muttrc || true
+cp -if `pwd`/msmtp ~/.mutt/msmtp || true
+cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc || true
+sudo cp -if `pwd`/sudo/mpd.conf /etc/mpd.conf || true
+sudo cp -if `pwd`/sudo/settings.json /etc/transmission-daemon/settings.json || true
+
+if [ "$1" = "-x" ]
+then
+	echo 'Also copying X files for non headless'
+	mkdir -p ~/.i3
+	cp -if `pwd`/i3/* ~/.i3/ || true
+	cp -if `pwd`/.xinitrc ~/.xinitrc || true
+	cp -if `pwd`/.Xresources ~/.Xresources || true
+fi