From d2dfb79dfcd2acbffe71154d2d028d838cc07dc2 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Thu, 18 Feb 2016 06:26:54 +0900 Subject: [PATCH] Add user configuration before sourcing Fisherman configuration Obviously this should be the other way around, otherwise, the user would not be able to modify any variables that have an effect when Fisherman starts. In other words, when users install Fisherman, the code in config.fish should be added before sourcing Fisherman configuration and not after (current way). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b112901..8a3a365 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ $(FISH_CONFIG): echo "set fisher_home $(FISHER_HOME)" | sed "s|/$$||;s|$$HOME|~|" > $@.fisher echo "set fisher_config $(FISHER_CONFIG)" | sed "s|$$HOME|~|" >> $@.fisher echo "source \$$fisher_home/config.fish" >> $@.fisher - awk 'FNR==NR{ print; a[$$0]; next } !($$0 in a) || /^$$/' $@.fisher $@ > $@.tmp + awk 'FNR==NR{ print; a[$$0]; next } !($$0 in a) || /^$$/' $@ $@.fisher > $@.tmp mv $@.tmp $@ && rm $@.fisher $(FISHER_CACHE):