update Makefile

Author: liangguohuan

Makefile

@@ -1,22 +1,20 @@
 #------------------------------------------------ 
 # Makefile for dotfile
+# 
+# WARN: the dotfiles must in user home, depth 1
 #------------------------------------------------ 
-#=> install or recover all dotfile to system
+#=> install dotfiles to system
 define publish
-	rsync -av \
-		--exclude 'vim-install.sh'\
-		--exclude 'preview.png'\
-		--exclude '.gitignore'\
-		--exclude '.git'\
-		--exclude 'fugitive:'\
-		--exclude 'README.md'\
-		--exclude 'LICENSE'\
-		--exclude 'Makefile'\
-		./ ../
+	rsync -av --exclude-from exclude.txt ./ ../
 endef
 
-#=> install vim dependens
-define installvim
+#=> push system updated files to dotfiles folder
+define push
+	rsync -av --existing --exclude-from exclude.txt ../ ./
+endef
+
+#=> install vim depends
+define ivim-depends
 	# install depends
 	sudo apt install curl git-core cmake python-dev
 
@@ -35,15 +33,34 @@ define installvim
 	vim +PlugInstall +qall
 endef
 
+#=> install vim
+define ivim
+	cp -f .vimrc ~/
+	cp -f .vim-basic.vim ~/
+	cp -f .vim-plugin.vim ~/
+	vim +PlugInstall +qall
+endef
+
 .PHONY: publish
 publish:
-	echo "sync dotfiles folder to home folder"
+	@echo "\033[38;5;2m""* sync dotfiles folder to home folder *""\033[0m"
 	@$(publish)
 
-all: ivim publish
+.PHONY: push
+push:
+	@echo "\033[38;5;2m""* sync home folder to dotfiles folder *""\033[0m"
+	@$(push)
+
+.PHONY: ivim-depends
+ivim-depends:
+	@echo "\033[38;5;2m""* install vim depends *""\033[0m"
+	$(ivim-depends)
 
 .PHONY: ivim
 ivim:
-	echo "install vim dependens"
-	$(installvim)
+	@echo "\033[38;5;2m""* install vim *""\033[0m"
+	$(ivim)
+
+install: ivim-depends ivim install 
+all: install
 

README.md

@@ -1,27 +1,42 @@
 This is my vim, zsh, tmux, etc. files.
 ===
 All dotfiles can be installed or recovered via Makefile commands simplely. See helps below.
+> WARN: the dotfiles must in user home, depth 1
+
+## install
+```
+cd ~
+git clone https://github.com/liangguohuan/dotfiles
+cd dotfiles
+make all
+```
 
 ## Makefile commands
 * `publish` (default command)  
-    install or recover all dotfile to system
+    publish dotfiles to system
+* `push`  
+    push system updated files to dotfiles folder
+* `ivim-depends`  
+    install vim depends
 * `ivim`  
-    install vim dependens
+    install vim
+* `install`  
+    exec all Makefile commands
 * `all`  
-    ivim publish
+    same as command `install`
 
-## vim-install
+## vim install (only)
 vim-conf base on [amix/vimrc](https://github.com/amix/vimrc). But use [ junegunn/vim-plug ](https://github.com/junegunn/vim-plug) to manage vim plugins,
 and so many things to be changed, just get some helps from `amix/vimrc` and read the sources from files `.vim-basic.vim` & `.vim-plugins`
 
 * ### install
 
-  - Step 1: clone the files, and use shell script `install.sh` to autoinsall.
-    > Notice: it will overwrite the files '.vimrc', '.vim-basic', '.vim-plugins' if they exists in home fold `~`
+  - Step 1: clone the files and install.
+    > Notice: it will overwrite the files '.vimrc', '.vim-basic', '.vim-plugins' if they exists in home folder `~`
   
           git clone https://github.com/liangguohuan/dotfiles
           cd dotfiles
-          sh ./vim-install.sh
+          make ivim
 
   - Step 3: Test it, it might need something other program like (ack, ag, install-markdown-d).
 

exclude.txt

@@ -0,0 +1,9 @@
+vim-install.sh
+preview.png
+.gitignore
+.git
+fugitive:
+README.md
+LICENSE
+Makefile
+exclude.txt