From f60b420eec7df324b78be2c99ad0929c0150ad5d Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 31 Oct 2021 21:39:20 -0500 Subject: [PATCH] Take status.html version info from toybox binary, not repo. Also, washing the sed call through /bin/sh confuses it. Don't do that. --- scripts/mkstatus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mkstatus.py b/scripts/mkstatus.py index 14ac85e6..5cb6ae77 100755 --- a/scripts/mkstatus.py +++ b/scripts/mkstatus.py @@ -23,8 +23,8 @@ print "Collecting data..." stuff,blah=readit(["sed","-n", 's//\\1 /;t good;d;:good;h;:loop;n;s@@@;t out;H;b loop;:out;g;s/\\n/ /g;p', "www/roadmap.html", "www/status.html"]) blah,toystuff=readit(["./toybox"]) -blah,pending=readit(["sed", "-n", "s/.*NEWTOY[(]\([^,]*\).*TOYFLAG_NOFORK.*/\1/p", "toys/pending/sh.c"], True) -blah,version=readit(["git","describe","--tags"]) +blah,pending=readit(["sed", "-n", "s/.*NEWTOY[(]\([^,]*\).*TOYFLAG_NOFORK.*/\1/p", "toys/pending/sh.c"]) +version=readit(["./toybox","--version"])[-1][-1] print "Analyzing..." @@ -102,7 +102,7 @@ outfile.write("""toybox current status Toybox Status """); -outfile.write("

Status of toybox %s

\n" % version[0]); +outfile.write("

Status of toybox %s

\n" % version); outfile.write("

Legend: %s pending

\n"%" ".join(map(lambda i: i[2]%(i[0].split("_")[0]), conv[:-2]))) outfile.write("

Completed

%s

\n" % "\n".join(done)) -- 2.39.2