manuel/void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/xbps-src/shutils/show.sh: make show display consistent

Browse Source 
previously, if there was a newline in some variables, it would not format
properly in `xbps-src show`. This fixes it by always splitting it by word
in some cases, like if there is a new line in the variable's value, and
removing internal commas in some cases.

This logic was split into a function for consistency.

fixes #40996

Example:
```
$ ./xbps-src show keepassxc
pkgname:	keepassxc
...
License(s):	GPL-3.0-or-later
License(s):	BSD-3-Clause
License(s):	CC0-1.0
License(s):	LGPL-2.0-only
License(s):	LGPL-2.1-only
License(s):	LGPL-3.0-or-later
License(s):	Nokia-Qt-exception-1.1
License(s):	MIT
License(s):	BSL-1.0
```
This commit is contained in:
classabbyamp 2022-12-12 01:21:29 -05:00 committed by classabbyamp
parent 42da881e15
commit 7c8f15bf1b
1 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
common/xbps-src/shutils/show.sh
View File

@ -1,49 +1,27 @@
# vim: set ts=4 sw=4 et:
show_pkg() {
local i=
echo "pkgname: $pkgname"
echo "version: $version"
echo "revision: $revision"
for i in ${distfiles}; do
[ -n "$i" ] && echo "distfiles: $i"
done
for i in ${checksum}; do
[ -n "$i" ] && echo "checksum: $i"
done
for i in ${archs}; do
[ -n "$i" ] && echo "archs: $i"
done
echo "maintainer: $maintainer"
[ -n "$homepage" ] && echo "Upstream URL: $homepage"
[ -n "$license" ] && echo "License(s): $license"
[ -n "$changelog" ] && echo "Changelog: $changelog"
[ -n "$build_style" ] && echo "build_style: $build_style"
for i in $build_helper; do
[ -n "$i" ] && echo "build_helper: $i"
done
for i in ${configure_args}; do
[ -n "$i" ] && echo "configure_args: $i"
done
echo "short_desc: $short_desc"
for i in ${subpackages}; do
[ -n "$i" ] && echo "subpackages: $i"
done
show_pkg_var "pkgname" "$pkgname"
show_pkg_var "version" "$version"
show_pkg_var "revision" "$revision"
show_pkg_var "distfiles" "$distfiles" 1
show_pkg_var "checksum" "$checksum" 1
show_pkg_var "archs" "$archs" 1
show_pkg_var "maintainer" "${maintainer}"
show_pkg_var "Upstream URL" "$homepage"
show_pkg_var "License(s)" "${license//,/ }" 1
show_pkg_var "Changelog" "$changelog"
show_pkg_var "build_style" "$build_style"
show_pkg_var "build_helper" "$build_helper" 1
show_pkg_var "configure_args" "$configure_args" 1
show_pkg_var "short_desc" "$short_desc"
show_pkg_var "subpackages" "$subpackages" 1
set -f
for i in ${conf_files}; do
[ -n "$i" ] && echo "conf_files: $i"
done
show_pkg_var "conf_files" "$conf_files" 1
set +f
for i in ${replaces}; do
[ -n "$i" ] && echo "replaces: $i"
done
for i in ${provides}; do
[ -n "$i" ] && echo "provides: $i"
done
for i in ${conflicts}; do
[ -n "$i" ] && echo "conflicts: $i"
done
show_pkg_var "replaces" "$replaces" 1
show_pkg_var "provides" "$provides" 1
show_pkg_var "conflicts" "$conflicts" 1
local OIFS="$IFS"
IFS=','
for var in $1; do
@ -51,11 +29,9 @@ show_pkg() {
if [ ${var} != ${var/'*'} ]
then
var="${var/'*'}"
[ -n "${!var}" ] && echo "$var: ${!var//$'\n'/' '}"
show_pkg_var "$var" "${!var//$'\n'/' '}"
else
for val in ${!var}; do
[ -n "$val" ] && echo "$var: $val"
done
show_pkg_var "$var" "${!var}" 1
fi
done
IFS="$OIFS"
@ -63,6 +39,28 @@ show_pkg() {
return 0
}
show_pkg_var() {
local _sep i=
local _label="$1"
local _value="$2"
local _always_split="$3"
if [ -n "$_value" ] && [ -n "$_label" ]; then
# on short labels, use more padding so everything lines up
if [ "${#_label}" -lt 7 ]; then
_sep=" "
else
_sep=" "
fi
if [ -n "$_always_split" ] || [[ "$_value" =~ $'\n' ]]; then
for i in ${_value}; do
[ -n "$i" ] && echo "${_label}:${_sep}${i}"
done
else
echo "${_label}:${_sep}${_value}"
fi
fi
}
show_pkg_deps() {
[ -f "${PKGDESTDIR}/rdeps" ] && cat ${PKGDESTDIR}/rdeps
}