Skip to content

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

epm-install: fix statuses

parent 2284bce2
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 5 deletions
bin/epm-install
View file @ 8ac0357b
...@@ -185,9 +185,10 @@ epm_install_files() ...@@ -185,9 +185,10 @@ epm_install_files()
case $PMTYPE in case $PMTYPE in
apt-rpm) apt-rpm)
sudocmd rpm -Uvh $force $nodeps $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
local RES=$?
# TODO: check for "is already installed" # TODO: check for "is already installed"
# 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 $RES
# use install_names # use install_names
;; ;;
...@@ -196,13 +197,18 @@ epm_install_files() ...@@ -196,13 +197,18 @@ epm_install_files()
if [ -n "$non_interactive" ] ; then if [ -n "$non_interactive" ] ; then
DPKGOPTIONS="--force-confdef --force-confold" DPKGOPTIONS="--force-confdef --force-confold"
fi fi
# FIXME: return false in case no install and in case install with broken deps
sudocmd dpkg $DPKGOPTIONS -i $@ sudocmd dpkg $DPKGOPTIONS -i $@
local RES=$?
# 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 $RES
# fall to apt-get -f install for fix deps # fall to apt-get -f install for fix deps
# can't use APTOPTIONS with empty install args # can't use APTOPTIONS with empty install args
epm_install_names -f epm_install_names -f
# repeat install for get correct status
sudocmd dpkg $DPKGOPTIONS -i $@
return return
;; ;;
yum-rpm|dnf-rpm) yum-rpm|dnf-rpm)
...@@ -215,16 +221,20 @@ epm_install_files() ...@@ -215,16 +221,20 @@ epm_install_files()
;; ;;
zypper-rpm) zypper-rpm)
sudocmd rpm -Uvh $force $nodeps $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
local RES=$?
# 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 $RES
ZYPPEROPTIONS=$(__use_zypper_no_gpg_checks) ZYPPEROPTIONS=$(__use_zypper_no_gpg_checks)
# use install_names # use install_names
;; ;;
urpm-rpm) urpm-rpm)
sudocmd rpm -Uvh $force $nodeps $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
local RES=$?
# 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 $RES
URPMOPTIONS=--no-verify-rpm URPMOPTIONS=--no-verify-rpm
# use install_names # use install_names
...@@ -238,7 +248,9 @@ epm_install_files() ...@@ -238,7 +248,9 @@ epm_install_files()
return ;; return ;;
pacman) pacman)
sudocmd pacman -U --noconfirm $force $nodeps $@ && return sudocmd pacman -U --noconfirm $force $nodeps $@ && return
[ -n "$nodeps" ] && return local RES=$?
[ -n "$nodeps" ] && return $RES
sudocmd pacman -U $force $@ sudocmd pacman -U $force $@
return ;; return ;;
slackpkg) 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