gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use $rust_stable

Browse Source 
(cherry picked from commit d567799d43)

# Conflicts:
#	docs/build-cli-usage.sh
This commit is contained in:
Michael Vines
2020-04-15 17:07:47 -07:00
parent 7ee993fadf
commit 7351e5ed2c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/build-cli-usage.sh
View File

@ -3,7 +3,11 @@ set -e
cd "$(dirname "$0")"
<<<<<<< HEAD
usage=$(cargo -q run -p solana-cli -- -C ~/.foo --help | sed 's|'"$HOME"'|~|g')
=======
usage=$(cargo +"$rust_stable" -q run -p solana-cli -- -C ~/.foo --help | sed -e 's|'"$HOME"'|~|g' -e 's/[[:space:]]\+$//')
>>>>>>> d567799d4... Use $rust_stable
out=${1:-src/cli/usage.md}
@ -29,6 +33,10 @@ in_subcommands=0
while read -r subcommand rest; do
[[ $subcommand == "SUBCOMMANDS:" ]] && in_subcommands=1 && continue
if ((in_subcommands)); then
<<<<<<< HEAD
section "$(cargo -q run -p solana-cli -- help "$subcommand" | sed 's|'"$HOME"'|~|g')" "####" >> "$out"
=======
section "$(cargo +"$rust_stable" -q run -p solana-cli -- help "$subcommand" | sed -e 's|'"$HOME"'|~|g' -e 's/[[:space:]]\+$//')" "####" >> "$out"
>>>>>>> d567799d4... Use $rust_stable
fi
done <<<"$usage">>"$out"