Archives/fisher
2
0
Fork 0
mirror of https://github.com/jorgebucaran/fisher synced 2024-11-09 07:10:27 +00:00
Code Issues Projects Releases Wiki Activity

Add user configuration before sourcing Fisherman configuration

Browse Source 
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 8e7af93423
commit 48036fbc5d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -49,7 +49,7 @@ $(FISH_CONFIG):
echo "set fisher_home $(FISHER_HOME)" | sed "s|/$$||;s|$$HOME|~|" > $@.fisher echo "set fisher_home $(FISHER_HOME)" | sed "s|/$$||;s|$$HOME|~|" > $@.fisher
echo "set fisher_config $(FISHER_CONFIG)" | sed "s|$$HOME|~|" >> $@.fisher echo "set fisher_config $(FISHER_CONFIG)" | sed "s|$$HOME|~|" >> $@.fisher
echo "source \$$fisher_home/config.fish" >> $@.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 mv $@.tmp $@ && rm $@.fisher
$(FISHER_CACHE): $(FISHER_CACHE):