Commit 637dff12 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.21.3

parent 3272878d
...@@ -1520,27 +1520,29 @@ epm_changelog() ...@@ -1520,27 +1520,29 @@ epm_changelog()
epm_check() epm_check()
{ {
update_repo_if_needed update_repo_if_needed
local APTOPTIONS="$(subst_option non_interactive -y)"
local DNFOPTIONS="$(subst_option non_interactive -y) $(subst_option verbose --verbose) "
case $PMTYPE in case $PMTYPE in
apt-rpm) apt-rpm)
#sudocmd apt-get check || exit #sudocmd apt-get check || exit
#sudocmd apt-get update || exit #sudocmd apt-get update || exit
sudocmd apt-get -f install || return sudocmd apt-get -f $APTOPTIONS install || return
info "You can use epm dedup also" info "You can use epm dedup also"
;; ;;
apt-dpkg) apt-dpkg)
#sudocmd apt-get check || exit #sudocmd apt-get check || exit
#sudocmd apt-get update || exit #sudocmd apt-get update || exit
sudocmd apt-get -f install || return sudocmd apt-get -f $APTOPTIONS install || return
;; ;;
packagekit) packagekit)
docmd pkcon repair docmd pkcon repair
;; ;;
aptitude-dpkg) aptitude-dpkg)
sudocmd aptitude -f install || return sudocmd aptitude -f $APTOPTIONS install || return
#sudocmd apt-get autoremove #sudocmd apt-get autoremove
;; ;;
yum-rpm) yum-rpm)
docmd yum check docmd yum check $DNFOPTIONS
docmd package-cleanup --problems docmd package-cleanup --problems
#docmd package-cleanup --dupes #docmd package-cleanup --dupes
...@@ -1549,7 +1551,7 @@ case $PMTYPE in ...@@ -1549,7 +1551,7 @@ case $PMTYPE in
docmd rpm -Va --nofiles --nodigest docmd rpm -Va --nofiles --nodigest
;; ;;
dnf-rpm) dnf-rpm)
sudocmd dnf check sudocmd dnf check $DNFOPTIONS
;; ;;
emerge) emerge)
sudocmd revdep-rebuild sudocmd revdep-rebuild
...@@ -3111,9 +3113,10 @@ epm_install_files() ...@@ -3111,9 +3113,10 @@ epm_install_files()
return return
fi fi
# TODO: don't resolve fuzzy dependencies ()
# are there apt that don't support dpkg files to install? # are there apt that don't support dpkg files to install?
epm_install_names $(make_filepath "$@") #epm_install_names $(make_filepath "$@")
return #return
# old way: # old way:
...@@ -10920,7 +10923,7 @@ Examples: ...@@ -10920,7 +10923,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.21.2 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.21.3 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)" echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
...@@ -10930,7 +10933,7 @@ print_version() ...@@ -10930,7 +10933,7 @@ print_version()
Usage="Usage: epm [options] <command> [package name(s), package files]..." Usage="Usage: epm [options] <command> [package name(s), package files]..."
Descr="epm - EPM package manager" Descr="epm - EPM package manager"
EPMVERSION=3.21.2 EPMVERSION=3.21.3
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
...@@ -2247,7 +2247,7 @@ print_version() ...@@ -2247,7 +2247,7 @@ print_version()
local on_text="(host system)" local on_text="(host system)"
local virt="$($DISTRVENDOR -i)" local virt="$($DISTRVENDOR -i)"
[ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)" [ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
echo "Service manager version 3.21.2 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.21.3 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE" echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
......
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