admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some minor Vim issues (#518)

Browse Source
This commit is contained in:
FallenWarrior2k
2020-09-06 18:44:03 +02:00
committed by GitHub
parent dd61835332
commit 7910866985
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/steps/upgrade.vim
View File

@@ -1,5 +1,5 @@
if exists(":NeoBundleUpdate") if exists(":NeoBundleUpdate")
echo NeoBundle echo "NeoBundle"
NeoBundleUpdate NeoBundleUpdate
endif endif
@@ -11,7 +11,6 @@ endif
if exists(":PlugUpgrade") if exists(":PlugUpgrade")
echo "Plug" echo "Plug"
PlugUpgrade PlugUpgrade
PlugClean
PlugUpdate PlugUpdate
endif endif

8
src/steps/vim.rs
View File

@@ -27,10 +27,14 @@ pub fn vimrc(base_dirs: &BaseDirs) -> Result<PathBuf> {
fn nvimrc(base_dirs: &BaseDirs) -> Result<PathBuf> { fn nvimrc(base_dirs: &BaseDirs) -> Result<PathBuf> {
#[cfg(unix)] #[cfg(unix)]
return base_dirs.home_dir().join(".config/nvim/init.vim").require(); let base_dir =
// Bypass directories crate as nvim doesn't use the macOS-specific directories.
std::env::var_os("XDG_CONFIG_HOME").map_or_else(|| base_dirs.home_dir().join(".config"), PathBuf::from);
#[cfg(windows)] #[cfg(windows)]
return base_dirs.cache_dir().join("nvim/init.vim").require(); let base_dir = base_dirs.cache_dir();
base_dir.join("nvim/init.vim").require()
} }
fn upgrade(vim: &PathBuf, vimrc: &PathBuf, ctx: &ExecutionContext) -> Result<()> { fn upgrade(vim: &PathBuf, vimrc: &PathBuf, ctx: &ExecutionContext) -> Result<()> {