Skip to content

D
distro_info
Commit 07df92d3 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

distro_info: use yum for CentOS/7

parent 2c4ac730
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
bin/distro_info
View file @ 07df92d3
...@@ -48,7 +48,8 @@ override_distrib() ...@@ -48,7 +48,8 @@ override_distrib()
{ {
[ -n "$1" ] || return [ -n "$1" ] || return
VENDOR_ID='' VENDOR_ID=''
DISTRIB_ID="$1" DISTRIB_ID="$(echo "$1" | sed -e 's|/.*||')"
DISTRIB_RELEASE="$(echo "$1" | sed -e 's|.*/||')"
} }
# Translate DISTRIB_ID to vendor name (like %_vendor does), uses VENDOR_ID by default # Translate DISTRIB_ID to vendor name (like %_vendor does), uses VENDOR_ID by default
...@@ -135,6 +136,7 @@ case $DISTRIB_ID in ...@@ -135,6 +136,7 @@ case $DISTRIB_ID in
Fedora|LinuxXP|ASPLinux|CentOS|RHEL|Scientific|GosLinux|Amzn|RedOS) Fedora|LinuxXP|ASPLinux|CentOS|RHEL|Scientific|GosLinux|Amzn|RedOS)
CMD="dnf-rpm" CMD="dnf-rpm"
which dnf 2>/dev/null >/dev/null || CMD=yum-rpm which dnf 2>/dev/null >/dev/null || CMD=yum-rpm
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD=yum-rpm
;; ;;
Slackware) Slackware)
CMD="slackpkg" CMD="slackpkg"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment