code: purgatorio

Info  •  Files  •  Log

sh builtin run now properly expands path if no ./ is supplied

--- a/appl/cmd/sh/sh.b

+++ b/appl/cmd/sh/sh.b

@@ -768,7 +768,9 @@

 		}

 		if (!disfile) {

-			fd = sys->open(npath += ".dis", sys->OREAD);

+			npath += ".dis";

+			sys->print("trying ⇒ %s\n", npath);

+			fd = sys->open(npath, sys->OREAD);

 			if(fd != nil){

 				return npath;

 			}

@@ -1940,8 +1942,8 @@

 	ctxt.push();

 	{

 		ctxt.setoptions(ctxt.INTERACTIVE, 0);

-		#path := pathexpand(ctxt, (hd tl args).word);

-		runscript(ctxt, (hd tl args).word, tl tl args, 1);

+		path := pathexpand(ctxt, (hd tl args).word);

+		runscript(ctxt, path, tl tl args, 1);

 		ctxt.pop();

 		return nil;

 	} exception e {