Commit 5fb77cf4 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.55.8

parent 4f476535
...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR ...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.55.7" EPMVERSION="3.55.8"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -500,13 +500,14 @@ esu() ...@@ -500,13 +500,14 @@ esu()
else else
# just shell # just shell
showcmd "su -" showcmd "su -"
exec su - a= exec su -
fi fi
fi fi
set_pm_type set_pm_type
escape_args() escape_args()
{ {
local output='' local output=''
...@@ -529,11 +530,11 @@ esu() ...@@ -529,11 +530,11 @@ esu()
#info "Enter root password:" #info "Enter root password:"
if [ -n "$*" ] ; then if [ -n "$*" ] ; then
[ -n "$quiet" ] || showcmd "su - -c $escaped" [ -n "$quiet" ] || showcmd "su - -c $escaped"
exec su - -c "$escaped" a= exec su - -c "$escaped"
else else
# just shell # just shell
showcmd "su -" showcmd "su -"
exec su - a= exec su -
fi fi
fi fi
...@@ -557,10 +558,13 @@ regexp_subst() ...@@ -557,10 +558,13 @@ regexp_subst()
assure_exists() assure_exists()
{ {
local package="$2" local package="$2"
local textpackage=
[ -n "$package" ] || package="$(__get_package_for_command "$1")" [ -n "$package" ] || package="$(__get_package_for_command "$1")"
[ -n "$3" ] && textpackage=" >= $3"
( direct='' epm_assure "$1" $package $3 ) || fatal "Can't assure in '$1' command from $package$textpackage package" # ask for install: https://bugzilla.altlinux.org/42240
local ask=''
[ -n "$non_interactive" ] || ask=1
( direct='' interactive=$ask epm_assure "$1" $package $3 ) || fatal
} }
assure_exists_erc() assure_exists_erc()
......
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