From 421c059d14cc420ddf5861a09cfd1f49d2d37bfb Mon Sep 17 00:00:00 2001
From: Shidong Wang <wsdjeg@outlook.com>
Date: Sat, 13 Feb 2021 22:58:58 +0800
Subject: [PATCH] Fix SPACEVIMDIR

close https://github.com/SpaceVim/SpaceVim/issues/4021
---
 autoload/SpaceVim/custom.vim | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/autoload/SpaceVim/custom.vim b/autoload/SpaceVim/custom.vim
index 9136ddc35..ade1d335c 100644
--- a/autoload/SpaceVim/custom.vim
+++ b/autoload/SpaceVim/custom.vim
@@ -60,9 +60,16 @@ function! s:basic_mode() abort
   call s:write_to_config(config)
 endfunction
 
-function! s:write_to_config(config) abort
+function! s:global_dir() abort
+  if empty($SPACEVIMDIR)
+    return  s:FILE.unify_path(s:CMP.resolve(expand('~/.SpaceVim.d/')))
+  else
+    return s:FILE.unify_path($SPACEVIMDIR)
+  endif
+endfunction
 
-  let global_dir = empty($SPACEVIMDIR) ? expand('~/.SpaceVim.d/') : $SPACEVIMDIR
+function! s:write_to_config(config) abort
+  let global_dir = s:global_dir()
   let g:_spacevim_global_config_path = global_dir . 'init.toml'
   let cf = global_dir . 'init.toml'
   if filereadable(cf)
@@ -108,7 +115,7 @@ function! SpaceVim#custom#apply(config, type) abort
     let options = get(a:config, 'options', {})
     for [name, value] in items(options)
       if name ==# 'filemanager'
-        if value ==# 'defx' && !has("python3")
+        if value ==# 'defx' && !has('python3')
           call SpaceVim#logger#warn('defx requires +python3!', 0)
           continue
         endif
@@ -217,7 +224,7 @@ endfunction
 
 
 function! s:load_glob_conf() abort
-  let global_dir = empty($SPACEVIMDIR) ? s:FILE.unify_path(s:CMP.resolve(expand('~/.SpaceVim.d/'))) : $SPACEVIMDIR
+  let global_dir = s:global_dir()
   call SpaceVim#logger#info('global_dir is: ' . global_dir)
   if filereadable(global_dir . 'init.toml')
     let g:_spacevim_global_config_path = global_dir . 'init.toml'