Skip to content

Commit

Permalink
Merge tag 'nvimrc-v1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
razor-x committed Nov 3, 2016
2 parents 45e5148 + 5657492 commit 6b83d03
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ or wget
$ wget https://git.io/vwYRO -O - | sh
```

You will need to exit Neovim manually with `:qa` after each step.

### Manual Install

1. Install [vim-plug].
Expand Down Expand Up @@ -127,8 +125,6 @@ You will need to exit Neovim manually with `:qa` after each step.
$ NVIMRC_INSTALL=true nvim -c PlugInstall
```

You will need to exit Neovim manually with `:qa` after each step.

### Updating

Updating is handled via the normal [vim-plug commands].
Expand Down
17 changes: 9 additions & 8 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ EOF

echo -e " ➤ Run ❰ PlugInstall ❱ \033[0m"

nvim -c PlugClean!
nvim -c PlugInstall
NVIMRC_INSTALL=true nvim -c PlugInstall
nvim -c PlugClean!
nvim +PlugClean! +qa
nvim +PlugInstall +qa
NVIMRC_INSTALL=true nvim +PlugInstall +qa
nvim +PlugClean! +qa

echo
echo -e "\033[32m ✔ Completed ❰ PlugInstall ❱ \033[0m"
Expand Down Expand Up @@ -163,13 +163,14 @@ dev_mode () {

sed -i -e "s|${f_gstr}|${r_gstr}|g" $nvim_root/ginit.vim

nvim -c PlugClean!
nvim -c PlugInstall
nvim -c PlugClean!
nvim -c PlugUpdate
nvim +PlugClean! +qa
nvim +PlugInstall +qa
nvim +PlugClean! +qa
nvim +PlugUpdate +qa

echo -e "\033[32m ✔ Neovim now using nvimrc from this directory. \033[0m"
echo -e "\033[32m ➤ Run ./install.sh again to exit development mode. \033[0m"
exit 0
}

main $1

0 comments on commit 6b83d03

Please sign in to comment.