Compare commits

...

6 Commits

Author SHA1 Message Date
sammyette 144c082d3e
fix: change order of require paths
prevents using old outdated version of lunacolors if it isnt deleted
2021-09-30 00:15:35 -04:00
sammyette 2c10be0102
fix: add new require path 2021-09-30 00:01:03 -04:00
sammyette 37bc018a13
chore: update lunacolors 2021-09-29 23:56:16 -04:00
sammyette 630c0b0356
fix: dont trim spaces on cd dir args 2021-09-29 22:32:37 -04:00
sammyette afcc6fe63a
fix: handle error case of target in fs.cd not being a dir (closes #66) 2021-09-28 22:55:08 -04:00
sammyette a6a3962044
fix: correct url to github repo and add newline after error 2021-09-28 22:54:04 -04:00
4 changed files with 7 additions and 5 deletions

View File

@ -35,9 +35,11 @@ func cd(L *lua.LState) int {
switch e := err.(*os.PathError).Err.Error(); e { switch e := err.(*os.PathError).Err.Error(); e {
case "no such file or directory": case "no such file or directory":
LuaErr(L, 1) LuaErr(L, 1)
case "not a directory":
LuaErr(L, 2)
default: default:
fmt.Printf("Found unhandled error case: %s", e) fmt.Printf("Found unhandled error case: %s\n", e)
fmt.Printf("Report this at https://github.com/Hilbis/Hilbish/issues with the title being: \"fs: unahndled error case %s\", and show what caused it.\n", e) fmt.Printf("Report this at https://github.com/Rosettea/Hilbish/issues with the title being: \"fs: unhandled error case %s\", and show what caused it.\n", e)
LuaErr(L, 213) LuaErr(L, 213)
} }
} }

@ -1 +1 @@
Subproject commit 004bca95d6e848f03e237c46127286f8f064bebc Subproject commit d200fca13df1c47e133b269420223d7e257dbc41

View File

@ -16,7 +16,7 @@ commander.register('cd', function (args)
path = path .. tostring(args[i]) .. ' ' path = path .. tostring(args[i]) .. ' '
end end
path = path:gsub('$%$','\0'):gsub('${([%w_]+)}', os.getenv) path = path:gsub('$%$','\0'):gsub('${([%w_]+)}', os.getenv)
:gsub('$([%w_]+)', os.getenv):gsub('%z','$'):gsub("%s+", "") :gsub('$([%w_]+)', os.getenv):gsub('%z','$')
if path == '-' then if path == '-' then
path = oldDir path = oldDir

View File

@ -4,7 +4,7 @@ package main
// String vars that are free to be changed at compile time // String vars that are free to be changed at compile time
var ( var (
requirePaths = `';./libs/?/init.lua;./?/init.lua;./?/?.lua' requirePaths = `';./libs/?/?.lua;./libs/?/init.lua;./?/init.lua;./?/?.lua'
.. ';/usr/share/hilbish/libs/?/init.lua;' .. ';/usr/share/hilbish/libs/?/init.lua;'
.. ';/usr/share/hilbish/libs/?/?.lua;' .. ';/usr/share/hilbish/libs/?/?.lua;'
.. hilbish.home .. '/.local/share/hilbish/libs/?/init.lua;' .. hilbish.home .. '/.local/share/hilbish/libs/?/init.lua;'