Skip to content
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

Jump to bottom

feat: add --no-clobber option to CLI #3025

Merged
merged 4 commits into from
Oct 5, 2023
Merged

feat: add --no-clobber option to CLI #3025

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f54e131
feat: add `--noclobber` option to CLI
skoriop Oct 3, 2023
fa4b3be
docs: add `--noclobber` to man page
skoriop Oct 3, 2023
b55144d
fix: rename `--noclobber` to `--no-clobber`
skoriop Oct 4, 2023
48bd848
fix: stderr should also say `--no-clobber`
styfle Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions bin/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export async function main(nodeProcess) {
let tokens;
let config;
let opt;
let noclobber;

function getArg() {
let arg = argv.shift();
Expand Down Expand Up @@ -114,6 +115,10 @@ export async function main(nodeProcess) {
case '--config':
config = argv.shift();
break;
case '-n':
case '--no-clobber':
noclobber = true;
break;
case '-h':
case '--help':
return await help();
Expand Down Expand Up @@ -216,6 +221,10 @@ export async function main(nodeProcess) {
: await marked.parse(data, options);

if (output) {
if (noclobber && await fileExists(output)) {
nodeProcess.stderr.write('marked: output file \'' + output + '\' already exists, disable the \'-n\' / \'--noclobber\' flag to overwrite\n');
styfle marked this conversation as resolved.
Show resolved Hide resolved
nodeProcess.exit(1);
}
return await writeFile(output, html);
}

Expand Down
5 changes: 4 additions & 1 deletion man/marked.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## SYNOPSIS

`marked` [`-o` <output file>] [`-i` <input file>] [`-s` <markdown string>] [`-c` <config file>] [`--help`] [`--version`] [`--tokens`] [`--pedantic`] [`--gfm`] [`--breaks`] [`--no-etc...`] [`--silent`] [filename]
`marked` [`-o` <output file>] [`-i` <input file>] [`-s` <markdown string>] [`-c` <config file>] [`--help`] [`--version`] [`--tokens`] [`--no-clobber`] [`--pedantic`] [`--gfm`] [`--breaks`] [`--no-etc...`] [`--silent`] [filename]

## DESCRIPTION

Expand Down Expand Up @@ -45,6 +45,9 @@ Specify config file to use instead of the default `~/.marked.json` or `~/.marked
* -t, --tokens
Output a token list instead of html.

* -n, --no-clobber
Do not overwrite `output` if it exists.

* --pedantic
Conform to obscure parts of markdown.pl as much as possible.
Don't fix original markdown bugs.
Expand Down