Skip to content

Commit ea9cf16

Browse files
committed
xx-info: fix vendor
Signed-off-by: CrazyMax <[email protected]>
1 parent 3e9dd7f commit ea9cf16

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

base/xx-info

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ if [ -z "$XX_VENDOR" ]; then
123123
if [ -z "$XX_VENDOR" ]; then
124124
XX_VENDOR="unknown"
125125
fi
126-
if [ "$XX_VENDOR" != "unknown" ] && [ "$XX_VENDOR" != "debian" ]; then
127-
vendor="-${XX_VENDOR}"
128-
fi
129-
else
130-
vendor="-${XX_VENDOR}"
131126
fi
127+
case "$XX_VENDOR" in
128+
debian | ubuntu | rhel | fedora | centos | rocky | ol)
129+
;;
130+
*)
131+
vendor="-${XX_VENDOR}"
132+
;;
133+
esac
132134

133135
if [ -z "$XX_LIBC" ]; then
134136
if [ "$distro" = "alpine" ]; then
@@ -399,6 +401,7 @@ case "$1" in
399401
echo "XX_OS_VERSION=${XX_OS_VERSION}"
400402
echo "XX_ARCH=${TARGETARCH}"
401403
echo "XX_MARCH=${XX_MARCH}"
404+
echo "XX_VENDOR=${XX_VENDOR}"
402405
if [ "$TARGETOS" = "linux" ]; then
403406
echo "XX_PKG_ARCH=${XX_PKG_ARCH}"
404407
fi

0 commit comments

Comments
 (0)