From f5ee21eb36ab52f8d9c3bf911843607f5a00d868 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 4 Jul 2018 20:35:28 +0200
Subject: [PATCH] Update help and root prompt.

---
 gash/bournish-commands.scm |  1 +
 gash/gash.scm              | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gash/bournish-commands.scm b/gash/bournish-commands.scm
index bdc1518..ef03457 100644
--- a/gash/bournish-commands.scm
+++ b/gash/bournish-commands.scm
@@ -29,6 +29,7 @@
   #:use-module (gash guix-build-utils)
   #:use-module (gash io)
   #:export (
+            display-tabulated
             cat-command
             ls-command
             reboot-command
diff --git a/gash/gash.scm b/gash/gash.scm
index 198c002..1ecdcbc 100644
--- a/gash/gash.scm
+++ b/gash/gash.scm
@@ -250,8 +250,12 @@ copyleft.
   (display "\
 Hello, this is gash, Guile As SHell.
 
-TODO
-"))
+Gash is work in progress; many language constructs work, pipes work,
+some redirections work.
+")
+  (when (or %prefer-builtins? (not (PATH-search-path "ls")))
+    (display "\nIt features the following, somewhat naive builtin commands\n")
+    (display-tabulated (map car %commands))))
 
 (define (cp-command source dest)
   `(copy-file ,source ,dest))
@@ -405,7 +409,7 @@ TODO
         (report-jobs)
         (string-append
          l e "[01;32m" r user "@" host l e "[00m" r ":"
-         l e "[01;34m" r cwd l e "[00m" r "$ ")))))
+         l e "[01;34m" r cwd l e "[00m" r (if (zero? (getuid)) "# " "$ "))))))
 
 (define (string-prefix s1 s2)
   (substring/read-only s1 0 (string-prefix-length s1 s2)))