Archives/bpkg
2
0
Fork 0
mirror of https://github.com/bpkg/bpkg synced 2024-11-16 00:12:52 +00:00
Code Issues Projects Releases Wiki Activity

fix(lib/package/package.sh): correctly handle package introspection

Browse Source
This commit is contained in:
jwerle 2022-03-23 15:12:14 -04:00
parent 05ba93cdc8
commit 5fae8a6785
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/package/package.sh
View File

@ -16,6 +16,12 @@ usage () {
}
expand_grep_args () {
local strict_ending=$(echo "$@" | grep '\-\-strict')
if [ -n "$strict_ending" ]; then
shift
fi
local n=$#
if (( n > 0 )); then
@ -35,7 +41,11 @@ expand_grep_args () {
done
if (( n > 0 )); then
printf '\]?'
if [ -n "$strict_ending" ]; then
printf '\]'
else
printf '\]?'
fi
fi
return 0
@ -68,11 +78,16 @@ bpkg_package () {
## show value for a specific property
## in 'bpkg.json' or 'package.json'
declare -a results
declare -a peek
# shellcheck disable=SC2068
IFS=$'\n' read -r -d '' -a peek <<< "$(cat < "$pkg" | "$BPKG_JSON" -b | grep -E "$(expand_grep_args --strict "$@")")"
# shellcheck disable=SC2068
IFS=$'\n' read -r -d '' -a results <<< "$(cat < "$pkg" | "$BPKG_JSON" -b | grep -E "$(expand_grep_args $@)")"
if (( ${#results[@]} == 1 )); then
if (( $# > 1 )); then
if (( ${#peek[@]} > 0 )); then
echo "${results[@]}" | awk '{ $1=""; printf $0 }' | tr -d '"' | sed 's/^ *//;s/ *$//'
else
echo "${results[@]}"