Commit 3278d97b authored by Vitaly Lipatov's avatar Vitaly Lipatov

use env intead of eval

parent 54396ffe
...@@ -181,10 +181,10 @@ epm_ni_install_names() ...@@ -181,10 +181,10 @@ epm_ni_install_names()
sudocmd apt-get -y $noremove --force-yes -o APT::Install::VirtualVersion=true -o APT::Install::Virtual=true -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" $APTOPTIONS install $@ sudocmd apt-get -y $noremove --force-yes -o APT::Install::VirtualVersion=true -o APT::Install::Virtual=true -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" $APTOPTIONS install $@
return ;; return ;;
apt-dpkg) apt-dpkg)
sudocmd ACCEPT_EULA=y DEBIAN_FRONTEND=noninteractive apt-get -y $noremove --force-yes -o APT::Install::VirtualVersion=true -o APT::Install::Virtual=true -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" $APTOPTIONS install $@ sudocmd env ACCEPT_EULA=y DEBIAN_FRONTEND=noninteractive apt-get -y $noremove --force-yes -o APT::Install::VirtualVersion=true -o APT::Install::Virtual=true -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" $APTOPTIONS install $@
return ;; return ;;
aptitude-dpkg) aptitude-dpkg)
sudocmd ACCEPT_EULA=y DEBIAN_FRONTEND=noninteractive aptitude -y install $@ sudocmd env ACCEPT_EULA=y DEBIAN_FRONTEND=noninteractive aptitude -y install $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix) sudocmd yum -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
......
...@@ -133,7 +133,7 @@ showcmd() ...@@ -133,7 +133,7 @@ showcmd()
docmd() docmd()
{ {
showcmd "$*$EXTRA_SHOWDOCMD" showcmd "$*$EXTRA_SHOWDOCMD"
eval "$@" "$@"
} }
# Run every arg with docmd # Run every arg with docmd
...@@ -153,7 +153,7 @@ sudorun() ...@@ -153,7 +153,7 @@ sudorun()
{ {
set_sudo set_sudo
if [ -z "$SUDO" ] ; then if [ -z "$SUDO" ] ; then
eval "$@" "$@"
return return
fi fi
$SUDO "$@" $SUDO "$@"
......
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