expand env in shell

itsManjeet · Jan 1, 2025 · c1b5f6f · c1b5f6f
1 parent 703e4a0
commit c1b5f6f
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 195 deletions.
diff --git a/apps/files/go.sum b/apps/files/go.sum
diff --git a/apps/files/main.go b/apps/files/main.go
@@ -1,33 +1,5 @@
 package main
 
-import (
-	"image/color"
-	"log"
-	"os"
-
-	"rlxos/graphics/pkg/app"
-	"rlxos/graphics/pkg/canvas"
-	"rlxos/graphics/pkg/event"
-	"rlxos/graphics/pkg/widget"
-)
-
-type Box struct {
-	widget.BaseWidget
-	color color.Color
-}
-
-func (b *Box) Draw(c canvas.Canvas) {}
-
-func (b *Box) Update(e event.Event) {}
-
 func main() {
-	if err := app.Run(&Box{
-		color: color.NRGBA{
-			R: 255,
-			A: 255,
-		},
-	}); err != nil {
-		log.Println("ERROR:", err)
-		os.Exit(1)
-	}
+
 }
diff --git a/core/cmd/shell/main.go b/core/cmd/shell/main.go
@@ -13,8 +13,9 @@ import (
 
 func main() {
 	HOME := os.Getenv("HOME")
+	_ = os.Setenv("SHELL", os.Args[0])
 	reader, err := readline.NewEx(&readline.Config{
-		Prompt:            ":> ",
+		Prompt:            "> ",
 		HistoryFile:       filepath.Join(HOME, ".history"),
 		EOFPrompt:         "exit",
 		HistorySearchFold: true,
@@ -31,6 +32,7 @@ func main() {
 	for {
 
 		line, _ := reader.Readline()
+		line = os.ExpandEnv(line)
 
 		args := strings.Fields(line)
 		if len(args) == 0 {

diff --git a/devices/generic/x86_64/toolchain.conf b/devices/generic/x86_64/toolchain.conf
@@ -41,6 +41,7 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
 BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y
+BR2_PACKAGE_MESA3D_OPENGL_GLX=y
 BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_VULKAN_TOOLS=y
 BR2_PACKAGE_XORG7=y

diff --git a/graphics/go.mod b/graphics/go.mod
@@ -1,7 +1,3 @@
 module rlxos/graphics
 
 go 1.22
-
-require github.com/rajveermalviya/go-wayland/wayland v0.0.0-20230130181619-0ad78d1310b2
-
-require golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect
diff --git a/graphics/go.sum b/graphics/go.sum
@@ -1,4 +0,0 @@
-github.com/rajveermalviya/go-wayland/wayland v0.0.0-20230130181619-0ad78d1310b2 h1:tRhbehjSCwQSZL7A2AoZlKrDYhZzaPIAcpnhfaUc0Tw=
-github.com/rajveermalviya/go-wayland/wayland v0.0.0-20230130181619-0ad78d1310b2/go.mod h1:PXhW/GoWcMBeiZ39ZdgoMs/xduJEEUE+kxUBB2Kwd+M=
-golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI=
-golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

diff --git a/graphics/pkg/app/app.go b/graphics/pkg/app/app.go
diff --git a/graphics/pkg/canvas/canvas.go b/graphics/pkg/canvas/canvas.go
diff --git a/graphics/pkg/event/event.Event.go b/graphics/pkg/event/event.Event.go
diff --git a/graphics/pkg/widget/widget.go b/graphics/pkg/widget/widget.go