Do not overwrite cmder.lua on update

jankatins · Nov 24, 2015 · 4bfdf04 · 4bfdf04
1 parent c955049
commit 4bfdf04
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/config/cmder.lua → vendor/cmder.lua b/config/cmder.lua → vendor/cmder.lua
@@ -189,3 +189,13 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
         dofile(filename)
     end
 end
+
+-- now do the same for all lua files in config which do not start with '_'
+local user_config_dir = clink.get_env('CMDER_ROOT')..'\\config\\'
+for _,lua_module in ipairs(clink.find_files(user_config_dir..'*.lua')) do
+    -- Skip files that starts with _. This could be useful if some files should be ignored
+    if not string.match(lua_module, '^_.*') then
+        local filename = user_config_dir..lua_module
+        dofile(filename)
+    end
+end
diff --git a/vendor/init.bat b/vendor/init.bat
@@ -24,7 +24,7 @@
 )
 
 :: Run clink
-@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
+@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\vendor"
 
 :: Prepare for git-for-windows