install: Replace source by fish invocation

This commit is contained in:
Derek Stavis 2015-10-02 20:50:39 -03:00
parent 4c05682af9
commit 792e3b7b72
3 changed files with 9 additions and 9 deletions

View File

@ -18,7 +18,7 @@ Oh My Fish provides core infrastructure to allow you to install packages which e
# Install # Install
```fish ```fish
curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | source - curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | fish
omf help omf help
``` ```
@ -26,7 +26,7 @@ Or _download_ and run it yourself:
```fish ```fish
curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install
source install fish install
``` ```
## Update Instructions ## Update Instructions

View File

@ -1,9 +1,9 @@
#!/usr/bin/env fish #!/usr/bin/env fish
# #
# USAGE # USAGE
# #1: curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | source - # #1: curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | fish
# #2: curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install; and source install # #2: curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install; and fish install
# #3: env OMF_CONFIG=~/.omf curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | source - # #3: env OMF_CONFIG=~/.omf curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | fish
# #
# ENV # ENV
# XDG_DATA_HOME Base directory (~/.local/share) # XDG_DATA_HOME Base directory (~/.local/share)
@ -113,8 +113,7 @@ function install_omf
test -f "$OMF_CONFIG/bundle"; or echo "theme default" > "$OMF_CONFIG/bundle" test -f "$OMF_CONFIG/bundle"; or echo "theme default" > "$OMF_CONFIG/bundle"
test -f "$OMF_CONFIG/theme"; or echo "default" > "$OMF_CONFIG/theme" test -f "$OMF_CONFIG/theme"; or echo "default" > "$OMF_CONFIG/theme"
source "$OMF_PATH/init.fish" fish -c "omf install"
omf.bundle.install
end end
function main function main
@ -135,6 +134,7 @@ function main
if install_omf if install_omf
report success "Installation successful! Reload your shell to start using Oh My Fish." report success "Installation successful! Reload your shell to start using Oh My Fish."
set -q CI; or exec fish < /dev/tty
else else
report error "Oh My Fish installation failed.\n\nIf you think that it's a bug, please open an\nissue with the complete installation log here:\n\nhttp://github.com/oh-my-fish/oh-my-fish/issues" report error "Oh My Fish installation failed.\n\nIf you think that it's a bug, please open an\nissue with the complete installation log here:\n\nhttp://github.com/oh-my-fish/oh-my-fish/issues"
end end

View File

@ -17,7 +17,7 @@ Oh My Fish 提供核心基础设施的配置,允许每个人可以轻松安装
# 安装 # 安装
```fish ```fish
curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | source - curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | fish
omf help omf help
``` ```
@ -25,7 +25,7 @@ omf help
```fish ```fish
curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install
source install fish install
``` ```
# 快速入门 # 快速入门