Compare commits

..

No commits in common. "23f6986123fa2c24d71266ab4ba758c4d8a7ef33" and "a9018a2740954c510109480dceea90055c552460" have entirely different histories.

5 changed files with 7 additions and 17 deletions

View File

@ -1 +0,0 @@
titleAndCommits: true

View File

@ -7,4 +7,3 @@
- [x] Hooks - [x] Hooks
- [x] Aliases - [x] Aliases
- [ ] hlua (hilbish lua) - 100% lua in the hilbish interactive shell, cuz why not - [ ] hlua (hilbish lua) - 100% lua in the hilbish interactive shell, cuz why not
- [ ] Petals (name of plugins)

View File

@ -2,7 +2,6 @@ package fs
import ( import (
"os" "os"
"strings"
"github.com/yuin/gopher-lua" "github.com/yuin/gopher-lua"
) )
@ -27,7 +26,7 @@ var exports = map[string]lua.LGFunction{
func cd(L *lua.LState) int { func cd(L *lua.LState) int {
path := L.ToString(1) path := L.ToString(1)
err := os.Chdir(strings.TrimSpace(path)) err := os.Chdir(path)
if err != nil { if err != nil {
switch err.(*os.PathError).Err.Error() { switch err.(*os.PathError).Err.Error() {
case "no such file or directory": case "no such file or directory":

View File

@ -108,7 +108,6 @@ func main() {
if err == nil { if err == nil {
// If it succeeds, add to history and prompt again // If it succeeds, add to history and prompt again
readline.AddHistory(cmdString) readline.AddHistory(cmdString)
bait.Em.Emit("command.success", nil)
continue continue
} }

View File

@ -5,23 +5,17 @@ local fs = require 'fs'
local commander = require 'commander' local commander = require 'commander'
local bait = require 'bait' local bait = require 'bait'
commander.register('cd', function (args) commander.register('cd', function (path)
bait.throw('cd', args) if #path == 1 then
if #args > 0 then local ok, err = pcall(function() fs.cd(path[1]) end)
local path = ''
for i = 1, #args do
path = path .. tostring(args[i]) .. ' '
end
local ok, err = pcall(function() fs.cd(path) end)
if not ok then if not ok then
if err == 1 then if err == 1 then
print('directory does not exist') print('directory does not exist')
end end
bait.throw('command.fail', nil) end
else bait.throw('command.success', nil) end bait.throw('cd', path)
return return
end end
fs.cd(os.getenv 'HOME') fs.cd(os.getenv 'HOME')
bait.throw('command.success', nil) bait.throw('cd', path)
end) end)