diff options
| author |  netocrat <netocrat@dodo.com.au> | 2005-11-04 00:35:35 +1000 |
|---|---|---|
| committer | netocrat <netocrat@dodo.com.au> | 2005-11-04 00:35:35 +1000 |
| commit | 78d3b37e11f33e4aef0ad8c8649d7c3479a74884 (patch) | |
| tree | aa46d95638857d53bb0e148ddd45018fd5d44313 /init | |
| parent | 12aa33fad4fc4ade6ad6b0425ad3f262e0d79d09 (diff) | |
Modify fish init scripts to take account of @SYSCONFDIR@
darcs-hash:20051103143535-344c5-203a64cc8bdb14cc018254f6eb74852a1db4843f.gz
Diffstat (limited to 'init')
| -rw-r--r-- | init/fish_complete.fish.in (renamed from init/fish_complete.fish) | 2 | ||||
| -rw-r--r-- | init/fish_interactive.fish.in (renamed from init/fish_interactive.fish) | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/init/fish_complete.fish b/init/fish_complete.fish.in index 7dd6bb4d..989a126e 100644 --- a/init/fish_complete.fish +++ b/init/fish_complete.fish.in @@ -10,7 +10,7 @@ if not status --is-interactive exit end -set -g fish_complete_path /etc/fish.d/completions ~/.fish.d/completions +set -g fish_complete_path @SYSCONFDIR@/fish.d/completions ~/.fish.d/completions # Knowing the location of the whatis database speeds up command # description lookup. diff --git a/init/fish_interactive.fish b/init/fish_interactive.fish.in index 024ae74f..fc55b778 100644 --- a/init/fish_interactive.fish +++ b/init/fish_interactive.fish.in @@ -39,9 +39,11 @@ end # other than fish, which may use a different file. The new value should # be exported, since the fish inputrc file plays nice with other files # by including them when found. +# Give priority to the default file installed with fish in +# @SYSCONFDIR@/fish_inputrc. # -for i in ~/.fish_inputrc ~/etc/fish_inputrc /etc/fish_inputrc ~/.inputrc /etc/inputrc +for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/etc/fish_inputrc /etc/fish_inputrc ~/.inputrc /etc/inputrc if test -f $i set -xg INPUTRC $i break |