Repository navigation
Commit e973f52
committed
Use some handy bash-isms in version check script
The script is nonportable to other shells already because of its
use of trap (and other features, such as implicit assumptions made
about echo, and the function keyword), which its hashbang already
clearly conveys.
This uses:
- $(<X) in place of $(cat X), to have the shell read the file
directly rather than using cat.
- printf -v in one place to set a variable rather than printing.
This eliminates a command substitution that was harder to read.1 parent 0920371 commit e973f52
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,7 @@ readonly changes_path='doc/source/changes.rst' | |||
| 12 | 12 | ||
| 13 | 13 | function get_latest_tag() { | |
| 14 | 14 | local config_opts | |
| 15 | - config_opts="$(printf ' -c versionsort.suffix=-%s' alpha beta pre rc RC)" | ||
| 15 | + printf -v config_opts ' -c versionsort.suffix=-%s' alpha beta pre rc RC | ||
| 16 | 16 | # shellcheck disable=SC2086 # Deliberately word-splitting the arguments. | |
| 17 | 17 | git $config_opts tag -l '[0-9]*' --sort=-v:refname | head -n1 | |
| 18 | 18 | } | |
@@ -31,7 +31,7 @@ echo 'Checking that ALL changes are committed.' | |||
| 31 | 31 | git status -s --ignore-submodules | |
| 32 | 32 | test -z "$(git status -s --ignore-submodules)" | |
| 33 | 33 | ||
| 34 | - version_version="$(cat "$version_path")" | ||
| 34 | + version_version="$(<"$version_path")" | ||
| 35 | 35 | changes_version="$(awk '/^[0-9]/ {print $0; exit}' "$changes_path")" | |
| 36 | 36 | latest_tag="$(get_latest_tag)" | |
| 37 | 37 | head_sha="$(git rev-parse HEAD)" | |
0 commit comments