mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter synced 2024-11-14 22:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct grep output when asking for line numbers

Browse Source 
A couple of issues here:
- We didn't pass the line number to do_grep_line() so `i` was undefined
- Operator precedence messed with the ternary so when line numbers were
  requested, the line wouldn't be output.

Found thanks to this now-solved eslint issue:

/puter/packages/phoenix/src/puter-shell/coreutils/grep.js
  100:60  error  'i' is not defined  no-undef
This commit is contained in:
Sam Atkins 2024-05-01 11:28:32 +01:00
parent 71f8afab9a
commit c8a20cadbf
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/phoenix/src/puter-shell/coreutils/grep.js
View File

@ -78,7 +78,7 @@ export default {
}
}
const do_grep_line = async ( line ) => {
const do_grep_line = async ( line, lineNumber ) => {
if ( line.endsWith('\n') ) line = line.slice(0, -1);
const re = new RegExp(
pattern,
@ -97,10 +97,9 @@ export default {
);
if ( lxor(values['invert-match'], re.test(line)) ) {
const lineNumber = values['line-number'] ? i + 1 : '';
const lineToPrint =
lineNumber ? lineNumber + ':' : '' +
line;
const lineToPrint = values['line-number']
? `${lineNumber + 1}:${line}`
: line;
console.log(`LINE{${lineToPrint}}`);
await ctx.externs.out.write(lineToPrint + '\n');
@ -111,7 +110,7 @@ export default {
for ( let i=0 ; i < lines.length ; i++ ) {
const line = lines[i];
await do_grep_line(line);
await do_grep_line(line, i);
}
}
@ -139,10 +138,10 @@ export default {
for ( let file of files ) {
if ( file === '-' ) {
for ( ;; ) {
for ( let i = 0; ; i++) {
const { value, done } = await ctx.externs.in_.read();
if ( done ) break;
await do_grep_line(value);
await do_grep_line(value, i);
}
} else {
file = resolveRelativePath(ctx.vars, file);