added ~ as home processing

This commit is contained in:
JISAUAY 2025-06-27 11:23:15 -05:00
parent 7062e798a9
commit 9e46cc9105
7 changed files with 79 additions and 6 deletions

View File

@ -1 +0,0 @@
apath ~/Documents/misc/ado-linker

View File

@ -2,13 +2,17 @@ package cmd
import (
"gosh/types"
"gosh/util"
"os"
"github.com/fatih/color"
)
func GoshCat(sh *types.Shell, filename string) types.CmdOutput {
data, err := os.ReadFile(filename)
func GoshCat(sh *types.Shell, file_path string) types.CmdOutput {
file_path = util.ExpandHome(file_path)
data, err := os.ReadFile(file_path)
red := color.New(color.FgRed).SprintFunc()
if err != nil {
return types.CmdOutput{Id: 1, Output: red(err)}

View File

@ -4,11 +4,15 @@ import (
"os"
"gosh/types"
"gosh/util"
"github.com/fatih/color"
)
func GoshCd(sh *types.Shell, dir string) types.CmdOutput {
dir = util.ExpandHome(dir)
err := os.Chdir(dir)
red := color.New(color.FgRed).SprintFunc()
if err != nil {

View File

@ -2,14 +2,27 @@ package cmd
import (
"gosh/types"
"gosh/util"
"os"
"strings"
"github.com/fatih/color"
)
func GoshLs(sh *types.Shell) types.CmdOutput {
children, err := os.ReadDir(sh.Cd)
func GoshLs(sh *types.Shell, paths ...string) types.CmdOutput {
var dir string
if len(paths) > 0 && paths[0] != "" {
dir = paths[0]
} else {
dir = sh.Cd
}
dir = util.ExpandHome(dir)
children, err := os.ReadDir(dir)
red := color.New(color.FgRed).SprintFunc()
if err != nil {
return types.CmdOutput{Id: 1, Output: red(err)}

View File

@ -2,12 +2,16 @@ package cmd
import (
"gosh/types"
"gosh/util"
"path/filepath"
"github.com/fatih/color"
)
func GolshPyapath(sh *types.Shell, path string) types.CmdOutput {
path = util.ExpandHome(path)
abs, err := filepath.Abs(path)
red := color.New(color.FgRed).SprintFunc()

32
main.go
View File

@ -43,6 +43,21 @@ func parse_flags(parts []string) (map[string]string, []string) {
return flags, args
}
func process_golshscript(sh *types.Shell, file_path string) {
data, err := os.ReadFile(file_path)
if err != nil {
fmt.Println("Error: ", err)
return
}
lines := strings.Split(string(data), "\n")
for _, line := range lines {
gosh_process_input(sh, strings.TrimSpace(line))
}
}
func check_pathes(sh *types.Shell, name string, args []string) bool {
var output types.CmdOutput
@ -105,7 +120,11 @@ func gosh_process_input(sh *types.Shell, input string) {
}
prevOutput = cmd.GoshCd(sh, parts[1])
case "ls":
if len(parts) > 1 {
prevOutput = cmd.GoshLs(sh, parts[1:]...)
} else {
prevOutput = cmd.GoshLs(sh)
}
case "cat":
if len(parts) < 2 {
fmt.Println("Usage: cat <path to file>")
@ -155,6 +174,19 @@ func main() {
Cd: dir,
PyPaths: []string{}}
// Check for and execute .golshrc
golshrc_path, _ := os.UserHomeDir()
golshrc_path = golshrc_path + "/.golshrc"
_, err := os.Stat(golshrc_path)
golshrc_exists := err == nil
fmt.Println(golshrc_exists)
if golshrc_exists {
fmt.Println("exists")
process_golshscript(&sh, golshrc_path)
}
var should_exit = false
for {
c.Print(sh.Cd)

17
util/util.go Normal file
View File

@ -0,0 +1,17 @@
package util
import (
"os"
"strings"
)
func ExpandHome(path string) string {
if strings.HasPrefix(path, "~") {
home, err := os.UserHomeDir()
if err == nil {
return strings.Replace(path, "~", home, 1)
}
}
return path
}