user: reorganize userspace directories

userspace/Cargo.toml

@@ -1,27 +1,26 @@
 [workspace]
 resolver = "1"
 members = [
-    "init",
-    "shell",
-    "sysutils",
-    "red",
-    "colors",
-    "term",
-    "lib/libcolors",
-    "lib/libterm",
-    "netutils",
-    "netutils",
     "dyn-loader",
-    "rdb",
+    "graphics/colors",
-    "lib/yasync",
+    "graphics/term",
-    "rsh",
     "lib/cross",
-    "crypt",
+    "lib/libcolors",
+    "lib/libpsf",
+    "lib/libterm",
+    "lib/logsink",
     "lib/runtime",
     "lib/uipc",
-    "lib/logsink",
+    "lib/yasync",
-    "lib/libpsf",
+    "netutils",
-    "strace"
+    "sysutils",
+    "tools/crypt",
+    "tools/init",
+    "tools/rdb",
+    "tools/red",
+    "tools/rsh",
+    "tools/shell",
+    "tools/strace",
 ]
 exclude = ["dynload-program", "test-kernel-module", "lib/ygglibc"]
 

userspace/shell/example.qs

@@ -1,28 +0,0 @@
-let x = 123
-let y = [1, 2, $x]
-
-fn f(a, b) {
-    echo ${a}
-    cat "/some/path/$b.txt"
-}
-
-fn g(xs) {
-    for item in $xs {
-        echo "* $item"
-    }
-}
-
-fn h() {
-    let counter = 0
-    for line in io:lines() {
-        echo "$counter $line"
-        counter = $counter + 1
-    }
-}
-
-a \
-    b \
-    c
-
-f $x "filename"
-g $y | h >output.txt

userspace/sysutils/Cargo.toml

@@ -26,7 +26,7 @@ tui.workspace = true
 regex = "1.11.1"
 pci-ids = { version = "0.2.5" }
 
-init = { path = "../init" }
+init = { path = "../tools/init" }
 
 [target.'cfg(target_os = "yggdrasil")'.dependencies]
 yggdrasil-abi.workspace = true