Update to status.html and some test suite cosmetic tweaks.

5 files changed, 33 insertions, 10 deletions

diff --git a/scripts/mkstatus.py b/scripts/mkstatus.py
index f9d3a1b0..c1b325eb 100755
--- a/scripts/mkstatus.py
+++ b/scripts/mkstatus.py
@@ -54,6 +54,7 @@ conv = [("posix", '<a href="http://pubs.opengroup.org/onlinepubs/9699919799/util
         ("toolbox", "", '{%s}'), ("klibc_cmd", "", '=%s='),
         ("sash_cmd", "", '#%s#'), ("sbase_cmd", "", '@%s@'),
         ("beastiebox_cmd", "", '*%s*'), ("tizen", "", '$%s$'),
+        ("shell", "", "%%%s%%"),
         ("request", '<a href="http://linux.die.net/man/1/%s">%%s</a>', '+%s+')]
 
 
@@ -98,7 +99,7 @@ print "implemented=%s" % len(toystuff)
 outfile=open("www/status.gen", "w")
 outfile.write("<h1>Status of toybox %s</h1>\n" % version[0]);
 outfile.write("<h3>Legend: [posix] &lt;lsb&gt; (development) {android}\n")
-outfile.write("=klibc= #sash# @sbase@ *beastiebox* $tizen$ +request+ other\n")
+outfile.write("=klibc= #sash# @sbase@ *beastiebox* $tizen$ %shell% +request+ other\n")
 outfile.write("<strike>pending</strike></h3>\n");
 
 outfile.write("<a name=done><h2><a href=#done>Completed</a></h2><blockquote><p>%s</p></blockquote>\n" % "\n".join(done))
diff --git a/scripts/runtest.sh b/scripts/runtest.sh
index 7f9e8b92..884af9c5 100644
--- a/scripts/runtest.sh
+++ b/scripts/runtest.sh
@@ -43,9 +43,9 @@ SHOWSKIP=SKIP
 
 if tty -s <&1
 then
-  SHOWPASS="$(echo -e "\033[1m\033[32m${SHOWPASS}\033[0m")"
-  SHOWFAIL="$(echo -e "\033[1m\033[31m${SHOWFAIL}\033[0m")"
-  SHOWSKIP="$(echo -e "\033[1m\033[33m${SHOWSKIP}\033[0m")"
+  SHOWPASS="$(echo -e "\033[1;32m${SHOWPASS}\033[0m")"
+  SHOWFAIL="$(echo -e "\033[1;31m${SHOWFAIL}\033[0m")"
+  SHOWSKIP="$(echo -e "\033[1;33m${SHOWSKIP}\033[0m")"
 fi
 
 optional()
diff --git a/scripts/single.sh b/scripts/single.sh
index 36de3159..522a7134 100755
--- a/scripts/single.sh
+++ b/scripts/single.sh
@@ -18,6 +18,7 @@ fi
 export KCONFIG_CONFIG=.singleconfig
 for i in "$@"
 do
+  echo -n "$i:"
   TOYFILE="$(egrep -l "TOY[(]($i)[ ,]" toys/*/*.c)"
 
   if [ -z "$TOYFILE" ]
diff --git a/www/roadmap.html b/www/roadmap.html
index c31e1f34..ece55fc8 100755
--- a/www/roadmap.html
+++ b/www/roadmap.html
@@ -91,6 +91,13 @@ This is not a complete list, a shell also needs exit, if, while, for, case,
 export, set, unset, trap, exec... And for bash compatability, function and
 source.)</p>
 
+<blockquote><b>
+<span id=shell>
+alias bg cd command fc fg getopts hash jobs kill read type ulimit umask
+unalias wait exit if while for case export set unset trap exec function source
+</span>
+<b></blockquote>
+
 <p>A few other commands are judgement calls, providing command-line
 internationalization support (iconv locale localedef), System V inter-process
 communication (ipcrm ipcs), and cross-tty communication from the minicomputer
@@ -203,13 +210,14 @@ C library, those are outside the scope of this project.)</p>
 bzcat cat cp dirname echo env patch rmdir sha1sum sleep sort sync
 true uname wc which yes zcat
 awk basename chmod chown cmp cut date dd diff
-egrep expr find grep gzip head hostname id install ln ls
+egrep expr fdisk find grep gzip head hostname id install ln ls
 mkdir mktemp mv od readlink rm sed sh tail tar touch tr uniq
 wget whoami xargs chgrp comm gunzip less logname split
 tee test time bunzip2 chgrp chroot comm cpio dmesg
 dnsdomainname ftpd ftpget ftpput gunzip ifconfig init less
 logname losetup mdev mount mountpoint nc pgrep pkill 
 pwd route split stat switch_root tac umount vi
+resize2fs tune2fs fsck.ext2 genext2fs mke2fs xzcat
 </span>
 </b></blockquote>
 
@@ -224,7 +232,7 @@ not yet supplied by toybox:</p>
 
 <blockquote><p>
 awk bunzip2 bzcat dd diff expr fdisk ftpd ftpget
-ftpput gunzip gzip less pgrep ping pkill route sh
+ftpput gunzip gzip less ping route sh
 sha512sum tar test tr unxz vi wget xzcat zcat
 </p></blockquote>
 
@@ -310,6 +318,13 @@ start stop top
 </span>
 </b></blockquote>
 
+<p>Update: Android.mk is currently building the following toybox files out
+of "pending". These should be a priority for cleanup:</p>
+
+<blockquote><b>
+dd expr lsof more netstat route tar tr traceroute
+</b></blockquote>
+
 <hr />
 <h2><a name=tizen /><a href="#tizen">Use case: Tizen Core</a></h2>
 
@@ -945,7 +960,9 @@ we're good. The uClinux project can rest in peace.</p>
 <h2>Requests:</h2>
 
 <p>The following additional commands have been requested (and often submitted)
-by various users:</p>
+by various users. I _really_ need to clean up this section.</p>
+
+<p>Also:</p>
 <blockquote><b>
 <span id=request>
 dig freeramdisk getty halt hexdump hwclock klogd modprobe ping ping6 pivot_root
@@ -959,11 +976,16 @@ count oneit fstype
 acpi blkid eject pwdx
 sulogin rfkill bootchartd
 arp makedevs sysctl killall5 crond crontab deluser last mkpasswd watch
-ipaddr iplink iproute blockdev rpm2cpio arping brctl dumpleases fsck
+blockdev rpm2cpio arping brctl dumpleases fsck
 tcpsvd tftpd
 factor fallocate fsfreeze inotifyd lspci nbd-client partprobe strings
 base64 mix
 reset hexedit nsenter shred
+fsync insmod ionice lsmod lsusb rmmod vmstat xxd iotop
+lsof ionice compress dhcp dhcpd addgroup delgroup host iconv ip
+ipcrm ipcs netstat openvt
+deallocvt iorenice
+udpsvd adduser
 </span>
 </b></blockquote>
 
diff --git a/www/status.html b/www/status.html
index 8d500800..8a1a5851 100755
--- a/www/status.html
+++ b/www/status.html
@@ -4,7 +4,6 @@
 
 <!--#include file="status.gen" -->
 
-<p>There is also <a href="todo.txt">a todo list</a>, but development's moved
-on a bit since it was written.</p>
+<p>See the <a href=roadmap.html>Roadmap page</a> for more information.</p>
 
 <!-- #include "footer.html" -->