fix(commands/cd): set oldpwd when cd-ing with no args (fixes #225)

readline-upstream
sammyette 5 months ago
parent 97188e73a5
commit c2db9e65fa
Signed by: sammyette
GPG Key ID: 904FC49417B44DCD

@ -8,28 +8,21 @@ commander.register('cd', function (args)
if #args > 1 then
print("cd: too many arguments")
return 1
elseif #args > 0 then
local path = args[1]:gsub('$%$','\0'):gsub('${([%w_]+)}', os.getenv)
:gsub('$([%w_]+)', os.getenv):gsub('%z','$'):gsub('^%s*(.-)%s*$', '%1')
end
if path == '-' then
path = dirs.old
print(path)
end
dirs.setOld(hilbish.cwd())
dirs.push(path)
local path = args[1] and args[1] or hilbish.home
if path == '-' then
path = dirs.old
print(path)
end
local ok, err = pcall(function() fs.cd(path) end)
if not ok then
print(err)
return 1
end
bait.throw('cd', path)
dirs.setOld(hilbish.cwd())
dirs.push(path)
return
local ok, err = pcall(function() fs.cd(path) end)
if not ok then
print(err)
return 1
end
fs.cd(hilbish.home)
bait.throw('cd', hilbish.home)
dirs.push(hilbish.home)
bait.throw('cd', path)
end)

Loading…
Cancel
Save