Skip to content

Fix echo >> append redirect being parsed as > redirect #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iaewing wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −15
Open

Fix echo >> append redirect being parsed as > redirect #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/lib/engine/shell/builtins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,21 +160,7 @@ async function echoCommand(args: string[], fs: FsLike, cwd: string): Promise<Bui
const escapeFlag = raw.startsWith('-e ');
const content_raw = escapeFlag ? raw.slice(3) : raw;

// Handle redirect: echo [-e] "content" > file
const redirectMatch = content_raw.match(/^(.*?)\s*>\s*(.+)$/);
if (redirectMatch) {
let content = redirectMatch[1].replace(/^["']|["']$/g, '');
if (escapeFlag) content = interpretEscapes(content);
const filepath = resolvePath(redirectMatch[2].trim(), cwd);
try {
await fs.promises.writeFile(filepath, content + '\n');
return { output: '', success: true };
} catch {
return { output: `echo: cannot write to '${redirectMatch[2]}'`, success: false };
}
}

// Handle append: echo [-e] "content" >> file
// Handle append: echo [-e] "content" >> file (must check before > to avoid >> being parsed as >)
const appendMatch = content_raw.match(/^(.*?)\s*>>\s*(.+)$/);
if (appendMatch) {
let content = appendMatch[1].replace(/^["']|["']$/g, '');
Expand All @@ -189,6 +175,20 @@ async function echoCommand(args: string[], fs: FsLike, cwd: string): Promise<Bui
}
}

// Handle redirect: echo [-e] "content" > file
const redirectMatch = content_raw.match(/^(.*?)\s*>(?!>)\s*(.+)$/);
if (redirectMatch) {
let content = redirectMatch[1].replace(/^["']|["']$/g, '');
if (escapeFlag) content = interpretEscapes(content);
const filepath = resolvePath(redirectMatch[2].trim(), cwd);
try {
await fs.promises.writeFile(filepath, content + '\n');
return { output: '', success: true };
} catch {
return { output: `echo: cannot write to '${redirectMatch[2]}'`, success: false };
}
}

let output = content_raw.replace(/^["']|["']$/g, '');
if (escapeFlag) output = interpretEscapes(output);
return { output, success: true };
Expand Down