X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/bd78babfeb92083f4e5e153603397ea0ec64dd4c..3e15c7e178bf62658a23570a628ff6e989d32ea9:/Makefile

diff --git a/Makefile b/Makefile
index 51eeb96..1f63f7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,30 @@
 APATH := $(realpath .)
 RPATH := $(subst $(wildcard ~/),,$(APATH))
 
-FILES :=
-DOTFILES := bash* flexget vimrc
+FILES := bin
+DOTFILES := aliasesrc bash* flexget vim* zsh*
 
 .PHONY: install $(FILES) $(DOTFILES)
 install: $(FILES) $(DOTFILES)
 
 $(FILES): 
-	if [[ -f ~/$@ || -d ~/$@ ]]; then \
-	  if [[ -d $@ ]]; then \
-	    cp -rf ~/$@/* $@; \
-	  else \
-	    cp -rf ~/$@ $@; \
-	  fi; \
-	  rm -r ~/$@; \
+	@if [[ -e ~/$@ && ! -L ~/$@ ]]; then \
+	    if [[ -d $@ ]]; then \
+	      cp -r ~/$@/* $@; \
+	    else \
+	      cp -r ~/$@ $@; \
+	    fi; \
+	    rm -r ~/$@; \
 	fi; 
-	ln -sf $(RPATH)/$@ ~/.$@ 
+	ln -sfT $(RPATH)/$@ ~/$@
 
 $(DOTFILES): 
-	if [[ -f ~/.$@ || -d ~/.$@ ]]; then \
-	  if [[ -d $@ ]]; then \
-	    cp -rf ~/.$@/* $@; \
-	  else \
-	    cp -rf ~/.$@ $@; \
-	  fi; \
-	  rm -r ~/.$@; \
+	@if [[ -e ~/.$@ && ! -L ~/.$@ ]]; then \
+	    if [[ -d .$@ ]]; then \
+	      cp -r ~/.$@/* $@; \
+	    else \
+	      cp -r ~/.$@ $@; \
+	    fi; \
+	    rm -r ~/.$@; \
 	fi; 
-	ln -sf $(RPATH)/$@ ~/.$@ 
+	ln -sfT $(RPATH)/$@ ~/.$@