Use dnf on newer redhat systems

This commit is contained in:
Alex Malinovich 2016-11-20 14:02:42 -08:00
commit ce947c13ea

View file

@ -67,7 +67,7 @@ WGETOPTIONS="" # extra options for wget. Used for progress bar.
CHECKUPDATE=yes CHECKUPDATE=yes
# Default options for package managers, override if needed # Default options for package managers, override if needed
REDHAT_INSTALL="yum -y install" REDHAT_INSTALL="dnf -y install"
DEBIAN_INSTALL="dpkg -i" DEBIAN_INSTALL="dpkg -i"
DISTRO_INSTALL="" DISTRO_INSTALL=""
@ -260,7 +260,7 @@ fi
# Allow manual control of configfile # Allow manual control of configfile
if [ ! -z "${CONFIGFILE}" ]; then if [ ! -z "${CONFIGFILE}" ]; then
if [ -f "${CONFIGFILE}" ]; then if [ -f "${CONFIGFILE}" ]; then
info "Using configuration: ${CONFIGFILE}" #>/dev/null info "Using configuration: ${CONFIGFILE}"
source "${CONFIGFILE}" source "${CONFIGFILE}"
else else
error "Cannot load configuration ${CONFIGFILE}" error "Cannot load configuration ${CONFIGFILE}"
@ -450,7 +450,11 @@ if [ -z "${DISTRO_INSTALL}" ]; then
REDHAT=yes REDHAT=yes
BUILD="linux-ubuntu-${ARCH}" BUILD="linux-ubuntu-${ARCH}"
DISTRO="redhat" DISTRO="redhat"
if ! hash dnf 2>/dev/null; then
DISTRO_INSTALL="${REDHAT_INSTALL/dnf/yum}"
else
DISTRO_INSTALL="${REDHAT_INSTALL}" DISTRO_INSTALL="${REDHAT_INSTALL}"
fi
else else
REDHAT=no REDHAT=no
BUILD="linux-ubuntu-${ARCH}" BUILD="linux-ubuntu-${ARCH}"