Commit c7c5bb77 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.26.2

parent d64b4917
...@@ -644,7 +644,7 @@ ALTLINUXPUBURL=http://ftp.altlinux.org/pub/distributions ...@@ -644,7 +644,7 @@ ALTLINUXPUBURL=http://ftp.altlinux.org/pub/distributions
__epm_addrepo_rhel() __epm_addrepo_rhel()
{ {
local repo="$@" local repo="$*"
if [ -z "$repo" ] ; then if [ -z "$repo" ] ; then
echo "Add repo." echo "Add repo."
echo "1. Use with repository URL, f.i. http://www.example.com/example.repo" echo "1. Use with repository URL, f.i. http://www.example.com/example.repo"
...@@ -1423,7 +1423,7 @@ case $PMTYPE in ...@@ -1423,7 +1423,7 @@ case $PMTYPE in
# FIXME: package-cleanup have to use stderr for errors # FIXME: package-cleanup have to use stderr for errors
local PKGLIST=$(package-cleanup -q --leaves | grep -v "^eepm-") local PKGLIST=$(package-cleanup -q --leaves | grep -v "^eepm-")
[ -n "$PKGLIST" ] || break [ -n "$PKGLIST" ] || break
showcmd epm remove $PKGLIST docmd epm remove $PKGLIST
done done
;; ;;
dnf-rpm) dnf-rpm)
...@@ -2732,16 +2732,16 @@ epm_filelist() ...@@ -2732,16 +2732,16 @@ epm_filelist()
epm_full_upgrade() epm_full_upgrade()
{ {
docmd epm update || return docmd epm update || fatal "repository updating is failed."
[ -n "$quiet" ] || echo [ -n "$quiet" ] || echo
docmd epm upgrade || return docmd epm upgrade || fatal "upgrading of the system is failed."
[ -n "$quiet" ] || echo [ -n "$quiet" ] || echo
docmd epm update-kernel || return docmd epm update-kernel || fatal "updating of the kernel is failed."
[ -n "$quiet" ] || echo [ -n "$quiet" ] || echo
docmd epm play --update all || return docmd epm play --update all || fatal "updating of applications installed via epm play is failed."
[ -n "$quiet" ] || echo [ -n "$quiet" ] || echo
docmd epm clean docmd epm clean
...@@ -3167,7 +3167,7 @@ __epm_if_command_path() ...@@ -3167,7 +3167,7 @@ __epm_if_command_path()
epm_install_files() epm_install_files()
{ {
local files="$@" local files="$*"
[ -z "$files" ] && return [ -z "$files" ] && return
# TODO: check read permissions # TODO: check read permissions
...@@ -6504,7 +6504,7 @@ case $PMTYPE in ...@@ -6504,7 +6504,7 @@ case $PMTYPE in
info "You need remove repo from /etc/pacman.conf" info "You need remove repo from /etc/pacman.conf"
;; ;;
npackd) npackd)
sudocmd npackdcl remove-repo --url="$@" sudocmd npackdcl remove-repo --url="$*"
;; ;;
winget) winget)
sudocmd winget source remove "$@" sudocmd winget source remove "$@"
...@@ -6530,7 +6530,7 @@ __epm_check_if_needed_repack() ...@@ -6530,7 +6530,7 @@ __epm_check_if_needed_repack()
# FIXME: use real way (for any archive) # FIXME: use real way (for any archive)
# FIXME: from вроде не существует и не работает # FIXME: from вроде не существует и не работает
local pkgname="$(epm print name from "$1")" local pkgname="$(epm print name from "$1")"
local repackcode="$CONFIGDIR/repack.d/$pkgname.sh" local repackcode="$EPM_REPACK_SCRIPTS_DIR/$pkgname.sh"
[ -x "$repackcode" ] || return [ -x "$repackcode" ] || return
warning "There is repack rule for $pkgname package. It is better install this package via 'epm --repack install' or 'epm play'." warning "There is repack rule for $pkgname package. It is better install this package via 'epm --repack install' or 'epm play'."
} }
...@@ -6554,7 +6554,7 @@ __epm_split_by_pkg_type() ...@@ -6554,7 +6554,7 @@ __epm_split_by_pkg_type()
__epm_repack_to_deb() __epm_repack_to_deb()
{ {
local pkg local pkg
local pkgs="$@" local pkgs="$*"
assure_exists alien assure_exists alien
assure_exists fakeroot assure_exists fakeroot
...@@ -11256,7 +11256,7 @@ Examples: ...@@ -11256,7 +11256,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.26.1 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.26.2 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-2022" echo "Copyright (c) Etersoft 2012-2022"
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."
...@@ -11266,7 +11266,7 @@ print_version() ...@@ -11266,7 +11266,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.26.1 EPMVERSION=3.26.2
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
...@@ -11577,6 +11577,7 @@ check_option() ...@@ -11577,6 +11577,7 @@ check_option()
case $1 in case $1 in
-v|--version) # HELPOPT: print version -v|--version) # HELPOPT: print version
[ -n "$epm_cmd" ] && return 1 [ -n "$epm_cmd" ] && return 1
[ -n "$short" ] && echo "3.26.2" | sed -e 's|-.*||' && exit 0
print_version print_version
exit 0 exit 0
;; ;;
......
...@@ -2321,7 +2321,7 @@ print_version() ...@@ -2321,7 +2321,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.26.1 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.26.2 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