Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unset GIT_DIR to unmess git calls. Fix #807. #808

Open
wants to merge 36 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1382847
Unset GIT_DIR to unmess git calls. Fix #807.
shippy Apr 12, 2017
3b55a85
Clarify Readme.
gmarik Jul 17, 2014
6cb5fb7
Update minirc to Plugin namespace
sukima Aug 26, 2014
fdc63af
Use svg instead of png to get better image quality
PeterDaveHello Sep 8, 2014
d822e7b
Add explicit note for Fish users to check the FAQ
jdevera Feb 20, 2015
ec679e4
Allow updating specific plugins.
Feb 16, 2015
3cf90c5
Complete installed plugins also for VundleUpdate
jdevera Mar 2, 2015
04828fa
Allow multiple calls to VundleChangelog.
lucc Apr 28, 2014
41ae35b
Remove unneeded variable setting.
lucc Mar 3, 2015
9543d63
Refactor global variables into script local variables.
lucc Mar 3, 2015
c56827d
Allow multiple calls to VundleLog.
lucc Mar 3, 2015
ed96672
Refactor global variables into autoload variables.
lucc Mar 3, 2015
d75d5a3
Set default values for autoload variables.
lucc Mar 3, 2015
66d501b
Prevent insecure plugin names.
Mar 13, 2015
5865ea7
Update repository references.
dleve123 Jul 26, 2015
d115e04
Vundle log, changelog, and scripts-view are no longer modifiable and the
nfischer Jul 10, 2015
d2cef2c
Update repository references throughout documentation. Also, fixed an
nfischer Sep 28, 2015
2803c64
Add 'vundlelog' filetype + settings/highlighting
Aug 6, 2015
29572e7
readme_zh_ch
wsdjeg Oct 26, 2015
87bfb7f
readme_zh_ch
wsdjeg Oct 26, 2015
309995c
finished readme
wsdjeg Oct 27, 2015
68bd818
Setting Vundle key mappings to be silent.
nfischer Nov 3, 2015
49ae71c
Update example in readme
wsdjeg Jan 30, 2016
f38d282
A traditional Chinese version of the README
VincentTam Feb 21, 2016
8ab491c
Corrected a missing word
VincentTam Feb 21, 2016
7257890
Removed BOM and CR
VincentTam Feb 22, 2016
aa7b500
A change corresponding to 52f3443
VincentTam Feb 26, 2016
c3da227
Update README_ZH_CN.md
archersmind Jul 31, 2016
b97af5a
A change corresponding to f4cea90
VincentTam Aug 21, 2016
469cee1
Use github markdown checkmarks (#749)
calebeby Oct 21, 2016
e42efc2
refine Chinese (Traditional) translations
vfreex Dec 8, 2016
a2f63d7
Remove example script which breaks install
kirkins Mar 12, 2017
af198a4
Add note about adding shell=/bin/bash to .vimrc for fish shell users
Mar 24, 2017
8f089ec
Comment instead of removing L9 plugin
kirkins Mar 30, 2017
cc36ca5
Comment other reference to L9
kirkins Mar 30, 2017
8b71a61
accidentally a 'set' in my vimrc
gregorycerna Apr 2, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ Issues

Before submitting an issue, be sure to check the following places for answers.

1. Vundle docs at [`:h vundle`](https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt).
1. Vundle docs at [`:h vundle`](https://github.com/VundleVim/Vundle.vim/blob/master/doc/vundle.txt).

2. The [FAQ](https://github.com/gmarik/Vundle.vim/search).
2. The [FAQ](https://github.com/VundleVim/Vundle.vim/wiki).

3. [Search](https://github.com/gmarik/Vundle.vim/search) the repository for related issues.
3. [Search](https://github.com/VundleVim/Vundle.vim/search) the repository for related issues.

## Try To Eliminate Your Vimrc

In order to make sure it isn't just `.vimrc` replace your own config file with the [minimal vimrc](https://github.com/gmarik/Vundle.vim/blob/master/test/minirc.vim). Clear out bundles and then try to reproduce.
In order to make sure it isn't just `.vimrc` replace your own config file with the [minimal vimrc](https://github.com/VundleVim/Vundle.vim/blob/master/test/minirc.vim). Clear out bundles and then try to reproduce.

If the problem stops, likely there is an issue in your user configuration. You can incrementally add back your user changes to the minimal file testing the bug each time. This will allow you to slowly bisect the issue. You may want to test one plugin at a time.

Expand All @@ -46,7 +46,7 @@ To better respond to issues please follow these general guidelines when explaini

I am using Vim on Kubuntu 13.04 64 bit and I get the following error... (add further explanation here)

To reproduce the bug, use the vimrc file below and run `:BundleInstall`... (continue with steps)
To reproduce the bug, use the vimrc file below and run `:PluginInstall`... (continue with steps)

Vimrc:
```
Expand All @@ -55,8 +55,8 @@ syntax on
filetype off
set rtp+=~/.vim/bundle/Vundle.vim/
call vundle#rc()
Bundle 'gmarik/Vundle.vim'
Bundle 'relevant/plugin'
Plugin 'VundleVim/Vundle.vim'
Plugin 'relevant/plugin'
filetype plugin indent on

.... more user configs here...
Expand Down
81 changes: 43 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [Help Maintain Vundle](https://github.com/gmarik/Vundle.vim/issues/383)
## [Help Maintain Vundle](https://github.com/VundleVim/Vundle.vim/issues/383)

## About

Expand All @@ -20,7 +20,7 @@

[Vundle] is undergoing an [interface change], please stay up to date to get latest changes.

[![Gitter-chat](https://badges.gitter.im/gmarik/Vundle.vim.png)](https://gitter.im/gmarik/Vundle.vim) for discussion and support.
[![Gitter-chat](https://badges.gitter.im/VundleVim/Vundle.vim.svg)](https://gitter.im/VundleVim/Vundle.vim) for discussion and support.

![Vundle-installer](http://i.imgur.com/Rueh7Cc.png)

Expand All @@ -34,9 +34,11 @@
If you are using Windows, go directly to [Windows setup]. If you run into any issues, please consult the [FAQ].
See [Tips] for some advanced configurations.

Using non-POSIX shells, such as the popular Fish shell, requires additional setup. Please check the [FAQ].

2. Set up [Vundle]:

`$ git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim`
`$ git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim`

3. Configure Plugins:

Expand All @@ -53,23 +55,24 @@
"call vundle#begin('~/some/path/here')

" let Vundle manage Vundle, required
Plugin 'gmarik/Vundle.vim'
Plugin 'VundleVim/Vundle.vim'

" The following are examples of different formats supported.
" Keep Plugin commands between vundle#begin/end.
" plugin on GitHub repo
Plugin 'tpope/vim-fugitive'
" plugin from http://vim-scripts.org/vim/scripts.html
Plugin 'L9'
" Plugin 'L9'
" Git plugin not hosted on GitHub
Plugin 'git://git.wincent.com/command-t.git'
" git repos on your local machine (i.e. when working on your own plugin)
Plugin 'file:///home/gmarik/path/to/plugin'
" The sparkup vim script is in a subdirectory of this repo called vim.
" Pass the path to set the runtimepath properly.
Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
" Avoid a name conflict with L9
Plugin 'user/L9', {'name': 'newL9'}
" Install L9 and avoid a Naming conflict if you've already installed a
" different version somewhere else.
" Plugin 'ascenator/L9', {'name': 'newL9'}

" All of your Plugins must be added before the following line
call vundle#end() " required
Expand All @@ -78,10 +81,10 @@
"filetype plugin on
"
" Brief help
" :PluginList - list configured plugins
" :PluginInstall(!) - install (update) plugins
" :PluginSearch(!) foo - search (or refresh cache first) for foo
" :PluginClean(!) - confirm (or auto-approve) removal of unused plugins
" :PluginList - lists configured plugins
" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate
" :PluginSearch foo - searches for foo; append `!` to refresh local cache
" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
"
" see :h vundle for more details or wiki for FAQ
" Put your non-Plugin stuff after this line
Expand All @@ -93,21 +96,23 @@

To install from command line: `vim +PluginInstall +qall`

5. (optional) For those using the fish shell: add `set shell=/bin/bash` to your `.vimrc`

## Docs

See the [`:h vundle`](https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt) Vimdoc for more details.
See the [`:h vundle`](https://github.com/VundleVim/Vundle.vim/blob/master/doc/vundle.txt) Vimdoc for more details.

## Changelog

See the [changelog](https://github.com/gmarik/Vundle.vim/blob/master/changelog.md).
See the [changelog](https://github.com/VundleVim/Vundle.vim/blob/master/changelog.md).

## People Using Vundle

see [Examples](https://github.com/gmarik/Vundle.vim/wiki/Examples)
see [Examples](https://github.com/VundleVim/Vundle.vim/wiki/Examples)

## Contributors

see [Vundle contributors](https://github.com/gmarik/Vundle.vim/graphs/contributors)
see [Vundle contributors](https://github.com/VundleVim/Vundle.vim/graphs/contributors)

*Thank you!*

Expand All @@ -125,22 +130,22 @@ see [Vundle contributors](https://github.com/gmarik/Vundle.vim/graphs/contributo
## TODO:
[Vundle] is a work in progress, so any ideas and patches are appreciated.

* activate newly added bundles on `.vimrc` reload or after `:PluginInstall`
* use preview window for search results
* Vim documentation
* put Vundle in `bundles/` too (will fix Vundle help)
* tests
* improve error handling
* allow specifying revision/version?
* handle dependencies
* show description in search results
* search by description as well
* make it rock!

[Vundle]:http://github.com/gmarik/Vundle.vim
[Windows setup]:https://github.com/gmarik/Vundle.vim/wiki/Vundle-for-Windows
[FAQ]:https://github.com/gmarik/Vundle.vim/wiki
[Tips]:https://github.com/gmarik/Vundle.vim/wiki/Tips-and-Tricks
* [x] activate newly added bundles on `.vimrc` reload or after `:PluginInstall`
* [x] use preview window for search results
* [x] Vim documentation
* [x] put Vundle in `bundles/` too (will fix Vundle help)
* [x] tests
* [x] improve error handling
* [ ] allow specifying revision/version?
* [ ] handle dependencies
* [ ] show description in search results
* [ ] search by description as well
* [ ] make it rock!

[Vundle]:http://github.com/VundleVim/Vundle.vim
[Windows setup]:https://github.com/VundleVim/Vundle.vim/wiki/Vundle-for-Windows
[FAQ]:https://github.com/VundleVim/Vundle.vim/wiki
[Tips]:https://github.com/VundleVim/Vundle.vim/wiki/Tips-and-Tricks
[Vim]:http://www.vim.org
[Git]:http://git-scm.com
[`git clone`]:http://gitref.org/creating/#clone
Expand All @@ -149,10 +154,10 @@ see [Vundle contributors](https://github.com/gmarik/Vundle.vim/graphs/contributo
[help tags]:http://vimdoc.sourceforge.net/htmldoc/helphelp.html#:helptags
[runtime path]:http://vimdoc.sourceforge.net/htmldoc/options.html#%27runtimepath%27

[configure]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233
[install]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254
[update]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265
[search]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295
[clean]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318
[interactive mode]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360
[interface change]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
[configure]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233
[install]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254
[update]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265
[search]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295
[clean]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318
[interactive mode]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360
[interface change]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
162 changes: 162 additions & 0 deletions README_ZH_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
## [帮助维护Vundle](https://github.com/VundleVim/Vundle.vim/issues/383)

## 关于

[Vundle] 是 _Vim bundle_ 的简称,是一个 [Vim] 插件管理器.

[Vundle] 允许你做...

* 同时在`.vimrc`中跟踪和[管理](https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233)插件
* [安装](https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254)特定格式的插件(a.k.a. scripts/bundle)
* [更新](https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265)特定格式插件
* 通过插件名称[搜索](https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295)[Vim scripts](http://vim-scripts.org/vim/scripts.html)中的插件
* [清理](https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318)未使用的插件
* 可以通过*单一按键*完成以上操作,详见[interactive mode](https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360)

[Vundle] 自动完成...

* 管理已安装插件的[runtime path](http://vimdoc.sourceforge.net/htmldoc/options.html#%27runtimepath%27)
* 安装和更新后,重新生成[帮助标签](http://vimdoc.sourceforge.net/htmldoc/helphelp.html#:helptags)

[Vundle] 正在经历一个 [interface change], 请通过以下方式获取最新信息.

讨论和技术支持:[![Gitter-chat](https://badges.gitter.im/VundleVim/Vundle.vim.svg)](https://gitter.im/VundleVim/Vundle.vim)

![Vundle-installer](http://i.imgur.com/Rueh7Cc.png)

## 快速开始

1. 介绍:

安装需要[Git](http://git-scm.com/),触发[`git clone`](http://gitref.org/creating/#clone),默认将每一个指定特定格式插件的仓库复制到`~/.vim/bundle/`.
搜索需要Curl支持.

Windows用户请直接访问[Windows setup]. 如果有任何问题, 请参考 [FAQ].
查看 [Tips] 获取相关高级配置.

使用 non-POSIX shells, 比如比较流行对 Fish shell, 需要额外对步骤. 请查看 [FAQ].

2. 初始安装 [Vundle]:

`$ git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim`

3. 配置插件 :

请将以下加在 `.vimrc` 方可使用Vundle. 删掉你不需要的插件, 这些只是用做示例.

```vim
set nocompatible " 去除VI一致性,必须
filetype off " 必须

" 设置包括vundle和初始化相关的runtime path
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
" 另一种选择, 指定一个vundle安装插件的路径
"call vundle#begin('~/some/path/here')

" 让vundle管理插件版本,必须
Plugin 'VundleVim/Vundle.vim'

" 以下范例用来支持不同格式的插件安装.
" 请将安装插件的命令放在vundle#begin和vundle#end之间.
" Github上的插件
" 格式为 Plugin '用户名/插件仓库名'
Plugin 'tpope/vim-fugitive'
" 来自 http://vim-scripts.org/vim/scripts.html 的插件
" Plugin '插件名称' 实际上是 Plugin 'vim-scripts/插件仓库名' 只是此处的用户名可以省略
Plugin 'L9'
" 由Git支持但不再github上的插件仓库 Plugin 'git clone 后面的地址'
Plugin 'git://git.wincent.com/command-t.git'
" 本地的Git仓库(例如自己的插件) Plugin 'file:///+本地插件仓库绝对路径'
Plugin 'file:///home/gmarik/path/to/plugin'
" 插件在仓库的子目录中.
" 正确指定路径用以设置runtimepath. 以下范例插件在sparkup/vim目录下
Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
" 安装L9,如果已经安装过这个插件,可利用以下格式避免命名冲突
Plugin 'ascenator/L9', {'name': 'newL9'}

" 你的所有插件需要在下面这行之前
call vundle#end() " 必须
filetype plugin indent on " 必须 加载vim自带和插件相应的语法和文件类型相关脚本
" 忽视插件改变缩进,可以使用以下替代:
"filetype plugin on
"
" 简要帮助文档
" :PluginList - 列出所有已配置的插件
" :PluginInstall - 安装插件,追加 `!` 用以更新或使用 :PluginUpdate
" :PluginSearch foo - 搜索 foo ; 追加 `!` 清除本地缓存
" :PluginClean - 清除未使用插件,需要确认; 追加 `!` 自动批准移除未使用插件
"
" 查阅 :h vundle 获取更多细节和wiki以及FAQ
" 将你自己对非插件片段放在这行之后
```

4. 安装插件:

运行 `vim` 再运行 `:PluginInstall`

通过命令行直接安装 `vim +PluginInstall +qall`

## Docs

查阅 [`:h vundle`](https://github.com/VundleVim/Vundle.vim/blob/master/doc/vundle.txt) Vimdoc 以获取更多细节.

## 更新日志

查阅 [changelog](https://github.com/VundleVim/Vundle.vim/blob/master/changelog.md).

## 在使用此插件的用户的VIMRC

查阅 [Examples](https://github.com/VundleVim/Vundle.vim/wiki/Examples)

## 维护者

查阅 [Vundle contributors](https://github.com/VundleVim/Vundle.vim/graphs/contributors)

*感谢!*

## 灵感 & 思路

* [pathogen.vim](http://github.com/tpope/vim-pathogen/)
* [Bundler](https://github.com/bundler/bundler)
* [Scott Bronson](http://github.com/bronson)

## 另外

* Vundle 已测试环境为: [Vim] 7.3 on OS X, Linux and Windows
* Vundle 尝试尽可能保持至简模式 [KISS](http://en.wikipedia.org/wiki/KISS_principle)

## TODO:
[Vundle] 是一个正在进步对项目, 所以很多设计思路和补丁是需要借鉴的.

* ✓ 在重新载入或者执行`:PluginInstall`之后激活`.vimrc`中新添加的插件
* ✓ 使用预览窗口显示搜索结果
* ✓ Vim documentation
* ✓ 同时将Vundle 放置在 `bundles/` 中 (将修复 Vundle 帮助)
* ✓ 测试
* ✓ 提升错误处理能力
* 支持手动指定版本(待考虑)
* 版本依赖
* 搜索结果中显示描述
* 同时支持通过描述搜索
* 使其更加稳定!

[Vundle]:http://github.com/VundleVim/Vundle.vim
[Windows setup]:https://github.com/VundleVim/Vundle.vim/wiki/Vundle-for-Windows
[FAQ]:https://github.com/VundleVim/Vundle.vim/wiki
[Tips]:https://github.com/VundleVim/Vundle.vim/wiki/Tips-and-Tricks
[Vim]:http://www.vim.org
[Git]:http://git-scm.com
[`git clone`]:http://gitref.org/creating/#clone

[Vim scripts]:http://vim-scripts.org/vim/scripts.html
[help tags]:http://vimdoc.sourceforge.net/htmldoc/helphelp.html#:helptags
[runtime path]:http://vimdoc.sourceforge.net/htmldoc/options.html#%27runtimepath%27

[configure]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233
[install]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254
[update]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265
[search]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295
[clean]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318
[interactive mode]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360
[interface change]:https://github.com/VundleVim/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
Loading