github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-25 09:41:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

lower case variable names for non-exported variables

Browse Source
This commit is contained in:
Bruno Pinto 2012-07-29 15:42:37 -03:00
parent 42fc751de3
commit 4a250d796b
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
oh-my-fish.fish
View File

@ -6,12 +6,12 @@ function _fish_add_plugin
set -l plugin $argv[1]
set -l plugin_path "plugins/$plugin"
if test -d $FISH/$plugin_path
set fish_function_path $FISH/$plugin_path $fish_function_path
if test -d $fish_path/$plugin_path
set fish_function_path $fish_path/$plugin_path $fish_function_path
end
if test -d $FISH_CUSTOM/$plugin_path
set fish_function_path $FISH_CUSTOM/$plugin_path $fish_function_path
if test -d $fish_custom/$plugin_path
set fish_function_path $fish_custom/$plugin_path $fish_function_path
end
end
@ -19,12 +19,12 @@ function _fish_add_completion
set -l plugin $argv[1]
set -l completion_path "plugins/$plugin/completions"
if test -d $FISH/$completion_path
set fish_complete_path $FISH/$completion_path $fish_complete_path
if test -d $fish_path/$completion_path
set fish_complete_path $fish_path/$completion_path $fish_complete_path
end
if test -d $FISH_CUSTOM/$completion_path
set fish_complete_path $FISH_CUSTOM/$completion_path $fish_complete_path
if test -d $fish_custom/$completion_path
set fish_complete_path $fish_custom/$completion_path $fish_complete_path
end
end
@ -32,12 +32,12 @@ function _fish_source_plugin_load_file
set -l plugin $argv[1]
set -l load_file_path "plugins/$plugin/$plugin.load.fish"
if test -e $FISH/$load_file_path
. $FISH/$load_file_path
if test -e $fish_path/$load_file_path
. $fish_path/$load_file_path
end
if test -e $FISH_CUSTOM/$load_file_path
. $FISH_CUSTOM/$load_file_path
if test -e $fish_custom/$load_file_path
. $fish_custom/$load_file_path
end
end
@ -45,10 +45,10 @@ end
# Configuration
###
# Set FISH_CUSTOM to the path where your custom config files
# Set fish_custom to the path where your custom config files
# and plugins exists, or else we will use the default custom.
if not set -q FISH_CUSTOM
set -g FISH_CUSTOM $FISH/custom
if not set -q fish_custom
set -g fish_custom $fish_path/custom
end
# Extracting user's functions – will be added later.
@ -56,20 +56,20 @@ set user_function_path $fish_function_path[1]
set -e fish_function_path[1]
# Add all functions
set fish_function_path $FISH/functions/ $fish_function_path
set fish_function_path $fish_path/functions/ $fish_function_path
# Add all defined plugins
for plugin in $FISH_PLUGINS
for plugin in $fish_plugins
_fish_add_plugin $plugin
_fish_add_completion $plugin
_fish_source_plugin_load_file $plugin
end
# Add user defined theme
set fish_function_path $FISH/themes/$FISH_THEME $fish_function_path
set fish_function_path $fish_path/themes/$fish_theme $fish_function_path
# Source all files inside custom folder
for config_file in $FISH_CUSTOM/*.load.fish
for config_file in $fish_custom/*.load.fish
. $config_file
end

10
templates/config.fish
View File

@ -1,15 +1,15 @@
# Path to your oh-my-fish.
set FISH $HOME/.oh-my-fish
set fish_path $HOME/.oh-my-fish
# Theme
set FISH_THEME robbyrussell
set fish_theme robbyrussell
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-fish/plugins/*)
# Custom plugins may be added to ~/.oh-my-fish/custom/plugins/
# Example format: set FISH_PLUGINS autojump git
# Example format: set fish_plugins autojump git
# Path to your custom folder (default path is $FISH/custom)
#set FISH_CUSTOM $HOME/dotfiles/oh-my-fish
#set fish_custom $HOME/dotfiles/oh-my-fish
# Load oh-my-fish cofiguration.
. $FISH/oh-my-fish.fish
. $fish_path/oh-my-fish.fish