Skip to content

Commit bee227c

Browse files
authored
Merge pull request #25 from GardenerGeralt/main
Add Wezterm support
2 parents 59bb70d + 0f94205 commit bee227c

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

doc/tags

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
DevcontainerConnect devcontainer-cli.nvim.txt /*DevcontainerConnect*
2+
DevcontainerDown devcontainer-cli.nvim.txt /*DevcontainerDown*
3+
DevcontainerExec devcontainer-cli.nvim.txt /*DevcontainerExec*
4+
DevcontainerToggle devcontainer-cli.nvim.txt /*DevcontainerToggle*
5+
DevcontainerUp devcontainer-cli.nvim.txt /*DevcontainerUp*
6+
devcontainer-cli.nvim devcontainer-cli.nvim.txt /*devcontainer-cli.nvim*
7+
devcontainer-cli.nvim.txt devcontainer-cli.nvim.txt /*devcontainer-cli.nvim.txt*

lua/devcontainer-cli/devcontainer_utils.lua

+5-1
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,11 @@ function M.create_connect_cmd()
230230
callback =
231231
function()
232232
local connect_command = {}
233-
if vim.env.TMUX ~= "" then
233+
if vim.env.TMUX ~= nil then
234234
connect_command = { "tmux split-window -h -t \"$TMUX_PANE\"" }
235+
elseif vim.fn.executable("wezterm") == 1 then
236+
connect_command = { "wezterm cli split-pane --right --cwd . -- bash -c" }
237+
dev_command = "\"" .. dev_command .. "\""
235238
elseif vim.fn.executable("allacrity") == 1 then
236239
connect_command = { "alacritty --working-directory . --title \"Devcontainer\" -e" }
237240
elseif vim.fn.executable("gnome-terminal") == 1 then
@@ -242,6 +245,7 @@ function M.create_connect_cmd()
242245
connect_command = { "Terminal.app" }
243246
else
244247
log.error("no supported terminal emulator found.")
248+
return false
245249
end
246250

247251
table.insert(connect_command, dev_command)

lua/devcontainer-cli/log.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ log.new = function(config, standalone)
9696
local lineinfo = info.short_src .. ":" .. info.currentline
9797

9898
-- Output to console
99-
if config.use_console and level < levels[config.console_level] then
99+
if config.use_console and level >= levels[config.console_level] then
100100
local console_string = string.format(
101101
"[%-6s%s] %s: %s",
102102
nameupper,
@@ -120,7 +120,7 @@ log.new = function(config, standalone)
120120
end
121121

122122
-- Output to log file
123-
if config.use_file and level < levels[config.log_level] then
123+
if config.use_file and level >= levels[config.log_level] then
124124
local fp = io.open(outfile, "a")
125125
local str = string.format("[%-6s%s] %s: %s\n",
126126
nameupper, os.date(), lineinfo, msg)

0 commit comments

Comments
 (0)