Skip to content

Commit 8d2f482

Browse files
committed
Change top-level versions.sh to stop recursing on explicit arguments
1 parent 386636e commit 8d2f482

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

versions.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#!/usr/bin/env bash
22
set -Eeuo pipefail
33

4-
dirs="$(find "$@" -type f -name versions.json -exec bash -Eeuo pipefail -c 'for d; do dir="$(dirname "${d#./}")"; printf " %q" "$dir"; done' -- '{}' +)"
5-
eval "set -- $dirs"
4+
if [ "$#" -eq 0 ]; then
5+
dirs="$(find -type f -name versions.json -exec bash -Eeuo pipefail -c 'for d; do dir="$(dirname "${d#./}")"; printf " %q" "$dir"; done' -- '{}' +)"
6+
eval "set -- $dirs"
7+
fi
68

79
if [ "$#" -eq 0 ]; then
8-
echo >&2 "error: failed to find any 'versions.json' files!"
10+
echo >&2 "error: failed to find any 'versions.json' files (in args or '$PWD')!"
911
exit 1
1012
fi
1113

@@ -14,7 +16,7 @@ for dir; do
1416

1517
script="$dir"
1618
while [ ! -x "$script/versions.sh" ]; do
17-
if [ "$script" = '.' ]; then
19+
if [ "$script" = '.' ] || [ "$script" = '/' ]; then
1820
echo >&2 "error: failed to find script for '$dir'!"
1921
exit 1
2022
fi

0 commit comments

Comments
 (0)