Skip to content

Handle scriptum.lua line endings and loading correctly on macOS #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: macos-support
Choose a base branch
from
Draft

Handle scriptum.lua line endings and loading correctly on macOS #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f8a972
Initial plan
Copilot May 20, 2026
20091dd
Use OS-specific line endings for scriptum example
Copilot May 20, 2026
3e36c30
Fix macOS scriptum loading and execution
Copilot May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions src/consul/consul.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2863,9 +2863,17 @@ consul.console.write(
f:close()
else
log:debug("Creating example script: " .. consul.scriptum.path_example)
f = consul.io_open(consul.scriptum.path_example, "w")
-- Detect OS via path separator
local is_windows = package.config:sub(1, 1) == '\\'
local line_ending = is_windows and "\r\n" or "\n"

-- Normalize line endings then apply the correct one for the current OS
local script_content = consul.scriptum.example_script:gsub("\r\n", "\n"):gsub("\n", line_ending)

-- Write in binary mode to prevent automatic line ending conversion
f = consul.io_open(consul.scriptum.path_example, "wb")
if f then
f:write(consul.scriptum.example_script)
f:write(script_content)
f:close()
end
end
Expand Down Expand Up @@ -2907,10 +2915,12 @@ consul.console.write(
log:error("Could not open scriptum file, this should never happen " .. path)
return
end
for line in f:lines() do
local content = f:read("*a") or ""
f:close()
content = content:gsub("\r\n", "\n"):gsub("\r", "\n")
for line in string.gmatch(content, "[^\n]+") do
table.insert(lines, line)
end
f:close()

log:trace("Loaded scriptum scripts: " .. consul.inspect(lines))

Expand Down Expand Up @@ -2998,7 +3008,23 @@ consul.console.write(
local index = string.sub(script_name, #ui.scriptum_entry + 1)
consul.scriptum.entry = ui.scriptum_entry_text .. index

local success, err = pcall(dofile, script)
local success, err = pcall(function()
local script_file, open_err = consul.io_open(script, "rb")
if not script_file then
error(open_err or ("Could not open script: " .. script))
end

local script_content = script_file:read("*a") or ""
script_file:close()
script_content = script_content:gsub("\r\n", "\n"):gsub("\r", "\n")

local chunk, load_err = loadstring(script_content, "@" .. script)
if not chunk then
error(load_err)
end

return chunk()
end)

-- Clean up after execution
consul.scriptum.entry = nil
Expand Down