Skip to content

E
eepm
Commit c01029e0 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm-install: fallback from low level to hi level install (fix file packages install on Fedora)

parent 36dac0e8
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 11 deletions
bin/epm-install
View file @ c01029e0
...@@ -73,7 +73,7 @@ epm_install_names() ...@@ -73,7 +73,7 @@ epm_install_names()
sudocmd pacman -S $@ sudocmd pacman -S $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum install $@ sudocmd yum $YUMOPTIONS install $@
return ;; return ;;
dnf-rpm) dnf-rpm)
sudocmd dnf install $@ sudocmd dnf install $@
...@@ -103,10 +103,10 @@ epm_ni_install_names() ...@@ -103,10 +103,10 @@ epm_ni_install_names()
sudocmd apt-get -y --force-yes install $@ sudocmd apt-get -y --force-yes install $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum -y install $@ sudocmd yum -y $YUMOPTIONS install $@
return ;; return ;;
urpm-rpm) urpm-rpm)
sudocmd urpmi --auto --no-verify-rpm $@ sudocmd urpmi --auto $URPMOPTIONS $@
return ;; return ;;
zypper-rpm) zypper-rpm)
yes | sudocmd zypper --non-interactive install $@ yes | sudocmd zypper --non-interactive install $@
...@@ -143,22 +143,27 @@ epm_install_files() ...@@ -143,22 +143,27 @@ epm_install_files()
sudocmd rpm -Uvh $force $nodeps $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
# if run with --nodeps, do not fallback on hi level # if run with --nodeps, do not fallback on hi level
[ -n "$nodeps" ] && return [ -n "$nodeps" ] && return
# use install_names # use install_names
;; ;;
apt-dpkg) apt-dpkg)
sudocmd dpkg -i $@ sudocmd dpkg -i $@
sudocmd apt-get -f install sudocmd apt-get -f install
return ;; return ;;
yum-rpm) yum-rpm|dnf-rpm)
sudocmd rpm -Uvh $force $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
sudocmd yum --nogpgcheck install $@ # if run with --nodeps, do not fallback on hi level
return ;;
dnf-rpm) [ -n "$nodeps" ] && return
sudocmd rpm -Uvh $force $@ && return YUMOPTIONS=--nogpgcheck
sudocmd dnf install $@ # use install_names
return ;; ;;
urpm-rpm) urpm-rpm)
sudocmd rpm -Uvh $force $nodeps $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
# if run with --nodeps, do not fallback on hi level
[ -n "$nodeps" ] && return
URPMOPTIONS=--no-verify-rpm
# use install_names # use install_names
;; ;;
pkg_add) pkg_add)
......
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