diff --git a/zsh/makefile b/zsh/makefile index 27cdd4f..cdd433a 100644 --- a/zsh/makefile +++ b/zsh/makefile @@ -3,23 +3,17 @@ SRC := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) include ../lib/shared.mk ZSH_DIR := ~/.zsh -ZPLUG_DIR := ~/.zplug +ZGENOM_DIR := ~/.zgenom up: init - if [ ! -d $(ZPLUG_DIR) ] ; then - $(report) error "$(ZPLUG_DIR) doesn't exist - run init first." + if [ ! -d $(ZGENOM_DIR) ] ; then + $(report) error "$(ZGENOM_DIR) doesn't exist - run init first." return fi - $(report) header "Updating zplug" - source $(ZPLUG_DIR)/init.zsh - source $(ZSH_DIR)/zplug - export zplugs - zplug install - zplug update ; $(report) "zplug upate" - zplug clean ; $(report) "zplug cleaned" + source $(ZGENOM_DIR)/zgenom.zsh down: - rm -rf $(ZPLUG_DIR) ; $(report) "deleting zplug dir" + rm -rf $(ZGENOM_DIR) ; $(report) "deleting zgenom dir" $(rm_link) ~/.zprofile $(rm_link) ~/.zlogin $(rm_link) ~/.zshrc @@ -29,7 +23,7 @@ down: init: $(info => Setting up zsh) - $(MAKE) -C $(SRC) init_zplug + $(MAKE) -C $(SRC) init_zgenom $(mk_link) $(SRC) ~/.zsh $(mk_link) $(ZSH_DIR)/zshrc ~/.zshrc $(mk_link) $(ZSH_DIR)/zlogin ~/.zlogin @@ -39,12 +33,10 @@ init: chmod 700 $(ZSH_DIR)/cache \ ; $(report) "updating cache permissions" -init_zplug: - if [ -e $(ZPLUG_DIR) ] ; then - $(report) debug "zplug already installed. Skipping" +init_zgenom: + if [ -e $(ZGENOM_DIR) ] ; then + $(report) debug "zgenom already installed. Skipping" return fi - export ZPLUG_HOME=$(ZPLUG_DIR) - git clone https://github.com/zplug/zplug $(ZPLUG_DIR) \ - ; $(report) "zplug installed" - + git clone https://github.com/jandamm/zgenom.git "${HOME}/.zgenom" \ + ; $(report) "zgenom installed"