Merge pull request #794 from JanSchulz/793-clink-settings

Reorganize how clink settings are loaded

config/settings

@@ -1,43 +0,0 @@
-# name: Ctrl-D exits
-# type: bool
-# Ctrl-D exits the process when it is pressed on an empty line.
-ctrld_exits = 1
-
-# name: Ctrl-C raises exception
-# type: bool
-# When Ctrl-C is pressed Clink will pass it thourgh to the parent by raising the
-# appropriate exception.
-passthrough_ctrlc = 1
-
-# name: Esc clears line
-# type: bool
-# Clink clears the current line when Esc is pressed (unless Readline's Vi mode
-# is enabled).
-esc_clears_line = 1
-
-# name: Match display colour
-# type: int
-# Colour to use when displaying matches. A value less than 0 will be the
-# opposite brightness of the default colour.
-match_colour = -1
-
-# name: Executable match style
-# type: enum
-# Changes how Clink will match executables when there is no path separator on
-# the line. 0 = PATH only, 1 = PATH and CWD, 2 = PATH, CWD, and directories. In
-# all cases both executables and directories are matched when there is a path
-# separator present.
-exec_match_style = 2
-
-# name: Prompt colour
-# type: int
-# Surrounds the prompt in ANSI escape codes to set the prompt's colour. Disabled
-# when the value is less than 0.
-prompt_colour = -1
-
-# name: Auto-answer terminate prompt
-# type: enum
-# Automatically answers cmd.exe's 'Terminate batch job (Y/N)?' prompts. 0 =
-# disabled, 1 = answer 'Y', 2 = answer 'N'.
-terminate_autoanswer = 0
-

vendor/clink.lua

@@ -1,3 +1,17 @@
+-- default script for clink, called by init.bat when injecting clink
+
+-- !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
+-- !!! Use "%CMDER_ROOT%\config\<whatever>.lua" to add your lua startup scripts
+
+
+-- At first, load the original clink.lua file
+-- this is needed as we set the script path to this dir and therefore the original 
+-- clink.lua is not loaded.
+local clink_lua_file = clink.get_env('CMDER_ROOT')..'\\vendor\\clink\\clink.lua'
+dofile(clink_lua_file)
+
+-- now add our own things...
+
 function lambda_prompt_filter()
     clink.prompt.value = string.gsub(clink.prompt.value, "{lamb}", "λ")
 end
@@ -190,12 +204,3 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
     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

vendor/init.bat

@@ -23,8 +23,14 @@
     set architecture=64
 )
 
+:: Tell the user about the clink config files...
+@if not exist "%CMDER_ROOT%\config\settings" (
+    echo Generating clink initial settings in %CMDER_ROOT%\config\settings
+    echo Additional *.lua files in %CMDER_ROOT%\config are loaded on startup.
+) 
+
 :: Run clink
-@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\vendor"
+@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
 
 :: Prepare for git-for-windows