mirror of
				https://github.com/cmderdev/cmder.git
				synced 2025-11-04 19:32:13 +08:00 
			
		
		
		
	Do not overwrite cmder.lua on update
This commit is contained in:
		
							
								
								
									
										10
									
								
								config/cmder.lua → vendor/cmder.lua
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								config/cmder.lua → vendor/cmder.lua
									
									
									
									
										vendored
									
									
								
							@@ -189,3 +189,13 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
 | 
				
			|||||||
        dofile(filename)
 | 
					        dofile(filename)
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
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
 | 
				
			||||||
							
								
								
									
										2
									
								
								vendor/init.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/init.bat
									
									
									
									
										vendored
									
									
								
							@@ -24,7 +24,7 @@
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
:: Run clink
 | 
					:: 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
 | 
					:: Prepare for git-for-windows
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user