Added required --force-bls-withdrawal-credentials description to --disable-deposits usage
#6436
Conversation
|
|
book/src/help_bn.md
Outdated
| ``` | ||
|
|
||
| <style> .content main {max-width:88%;} </style> | ||
| ```n<style> .content main {max-width:88%;} </style> |
There was a problem hiding this comment.
this looks wrong, did the script do this?
There was a problem hiding this comment.
which OS did you run it on?
There was a problem hiding this comment.
yeah I thought something was off but the scripts/cli.sh had this
There was a problem hiding this comment.
that regexp might need a tweak? it looks the same as the Linux one?
There was a problem hiding this comment.
well today I learned I'm still a noob programmer, but yeah I was defeated by a linux command.
I think using a printf just like the command to add the code block quote right above this line just solves the problem in an easy way and sed is just a little ambiguous for different distros.
there's another issue I'd like to point out
when I run make cli which uses docker this happens, if that would have worked I would have not come across the current issue. do you want to create a separate tracking issue for that?
There was a problem hiding this comment.
Hmm, I don't think that image is ever going to be public. Maybe that's just a doc issue
There was a problem hiding this comment.
Oh, it is public but it doesn't work on ARM.
There was a problem hiding this comment.
If you have Rosetta you can run x86_64 images on macOS using emulation. It's slower but it works.
scripts/cli.sh
Outdated
| @@ -16,7 +16,7 @@ write_to_file() { | |||
| printf "# %s\n\n\`\`\`\n%s\n\`\`\`" "$program" "$cmd" > "$file" | |||
|
|
|||
| # Adjust the width of the help text and append to the end of file | |||
| sed -i -e '$a\'$'\n''\n''<style> .content main {max-width:88%;} </style>' "$file" | |||
| printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file" | |||
There was a problem hiding this comment.
| printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file" | |
| printf '%s\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file" |
I think we might want to remove the 2nd newline. The markdown linter isn't happy
scripts/cli.sh
Outdated
| @@ -16,7 +16,7 @@ write_to_file() { | |||
| printf "# %s\n\n\`\`\`\n%s\n\`\`\`" "$program" "$cmd" > "$file" | |||
|
|
|||
| # Adjust the width of the help text and append to the end of file | |||
| sed -i -e '$a\'$'\n''\n''<style> .content main {max-width:88%;} </style>' "$file" | |||
| printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file" | |||
There was a problem hiding this comment.
For consistency, may I suggest we use double quote "" (as in the code above)? We can also remove the '' in the middle of the line for simplicity.
The following should do it:
| printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file" | |
| printf "\n\n%s\n" "<style> .content main {max-width:88%;} </style>" >> "$file" |
The \n\n is to create an empty line after the code block
There was a problem hiding this comment.
I've made the requested changes @chong-he
|
This looks good now, all checks passed |
|
can this be merged? I'm using the changes in a different PR and yes I will shift to ubuntu soon :) |
|
@Mergifyio queue |
🛑 Branch protection settings are not validated anymoreBranch protection is enabled and is preventing Mergify to merge the pull request. Mergify will merge when branch protection settings validate the pull request once again. (detail: 1 review requesting changes and 1 approving review by reviewers with write access.) |
|
@Mergifyio queue |
🛑 The pull request has been removed from the queue
|
|
@michaelsproul - I think you might need to unblock this |
|
@Mergifyio queue |
✅ The pull request has been merged automaticallyThe pull request has been merged automatically at da290e8 |
fixes #6391