Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc7cdaf4

Browse files
committed
Reduce code duplication in version check script
This extracts duplicated code to functions in check-version.sh.One effect is unfortunately that the specific commands being runare less explicitly clear when reading the script. However, smallfuture changes, if accidentally made to one but not the other ineither pair of "git status" commands, would create a much moreconfusing situation. So I think this change is justified overall.
1 parent7110bf8 commitc7cdaf4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

‎check-version.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ trap 'echo "$0: Check failed. Stopping." >&2' ERR
1010
readonly version_path='VERSION'
1111
readonly changes_path='doc/source/changes.rst'
1212

13+
functioncheck_status() {
14+
git status -s"$@"
15+
test -z"$(git status -s"$@")"
16+
}
17+
1318
functionget_latest_tag() {
1419
local config_opts
1520
printf -v config_opts' -c versionsort.suffix=-%s' alpha beta pre rc RC
@@ -23,13 +28,11 @@ test "$(cd -- "$(dirname -- "$0")" && pwd)" = "$(pwd)" # Ugly, but portable.
2328
echo"Checking that$version_path and$changes_path exist and have no uncommitted changes."
2429
test -f"$version_path"
2530
test -f"$changes_path"
26-
git status -s --"$version_path""$changes_path"
27-
test -z"$(git status -s --"$version_path""$changes_path")"
31+
check_status --"$version_path""$changes_path"
2832

2933
# This section can be commented out, if absolutely necessary.
3034
echo'Checking that ALL changes are committed.'
31-
git status -s --ignore-submodules
32-
test -z"$(git status -s --ignore-submodules)"
35+
check_status --ignore-submodules
3336

3437
version_version="$(<"$version_path")"
3538
changes_version="$(awk'/^[0-9]/ {print $0; exit}'"$changes_path")"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp