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).
This commit is contained in:
Jorge Bucaran 2016-02-18 06:26:54 +09:00
parent 7be1ad07d2
commit 68f73a1aa9
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30

View file

@ -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):