shithub: riscv

Info  •  Files  •  Log  •  Branches

use rc in awk, remove awk from APEDIRS in cmd mkfile

--- a/sys/src/cmd/awk/run.c

+++ b/sys/src/cmd/awk/run.c

@@ -64,17 +64,12 @@

 {

 	char status[512], *statfld[5];

 	int w, pid;

-	char cmd[30], *oty;

-	oty = getenv("cputype");

-	if(!oty)

-		return -1;

 	if(!s)

 		return 1; /* a command interpreter is available */

 	pid = fork();

-	snprint(cmd, sizeof cmd, "/%s/bin/ape/sh", oty);

 	if(pid == 0) {

-		execl(cmd, "sh", "-c", s, nil);

+		execl("/bin/rc", "rc", "-c", s, nil);

 		exits("exec");

 	}

 	if(pid < 0){

--- a/sys/src/cmd/mkfile

+++ b/sys/src/cmd/mkfile

@@ -13,7 +13,7 @@

 cpuobjtype=`{sed -n 's/^O=//p' /$cputype/mkfile}

 DIRS=`{echo */mkfile | sed 's,/mkfile *,\n,g' | grep -v '^('$NOMK')$'}

-APEDIRS=awk bzip2 compress cvs eqn grap gs links-ape lp pic postscript spin \

+APEDIRS=bzip2 compress cvs eqn grap gs links-ape lp pic postscript spin \

 	tex troff

 none:VQ: