Commit 8b532c0e authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.30.0

parent af604134
...@@ -26,9 +26,10 @@ if [ "$0" = "/dev/stdin" ] || [ "$0" = "sh" ] ; then ...@@ -26,9 +26,10 @@ if [ "$0" = "/dev/stdin" ] || [ "$0" = "sh" ] ; then
PROGNAME="" PROGNAME=""
fi fi
# will replaced to /usr/share/eepm during install # will replaced with /usr/share/eepm during install
SHAREDIR=$PROGDIR SHAREDIR=$PROGDIR
CONFIGDIR=$PROGDIR/.. # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc
load_helper() load_helper()
{ {
...@@ -1155,6 +1156,9 @@ case $PMTYPE in ...@@ -1155,6 +1156,9 @@ case $PMTYPE in
# clean-system removes non official packages # clean-system removes non official packages
sudocmd slackpkg clean-system sudocmd slackpkg clean-system
;; ;;
eopkg)
sudocmd eopkg remove-orphans
;;
#guix) #guix)
# sudocmd guix gc # sudocmd guix gc
# ;; # ;;
...@@ -1734,6 +1738,13 @@ check_pkg_integrity() ...@@ -1734,6 +1738,13 @@ check_pkg_integrity()
__epm_check_all_pkgs() __epm_check_all_pkgs()
{ {
case $PMTYPE in
eopkg)
sudocmd eopkg check
return
;;
esac
local j cl local j cl
#local play_installed="$(epm play --list-installed-packages)" #local play_installed="$(epm play --list-installed-packages)"
epm qa --short | xargs -n20 | while read cl ; do epm qa --short | xargs -n20 | while read cl ; do
...@@ -1762,6 +1773,9 @@ case $PMTYPE in ...@@ -1762,6 +1773,9 @@ case $PMTYPE in
assure_exists equery assure_exists equery
docmd equery check $@ docmd equery check $@
;; ;;
eopkg)
sudocmd eopkg check $@
;;
*) *)
fatal "Have no suitable command for $PMTYPE" fatal "Have no suitable command for $PMTYPE"
;; ;;
...@@ -1999,6 +2013,9 @@ case $PMTYPE in ...@@ -1999,6 +2013,9 @@ case $PMTYPE in
;; ;;
slackpkg) slackpkg)
;; ;;
eopkg)
sudocmd eopkg delete-cache
;;
pkgng) pkgng)
sudocmd pkg clean -a sudocmd pkg clean -a
;; ;;
...@@ -2542,6 +2559,9 @@ epm_download() ...@@ -2542,6 +2559,9 @@ epm_download()
opkg) opkg)
docmd opkg $* docmd opkg $*
;; ;;
eopkg)
docmd eopkg fetch $*
;;
homebrew) homebrew)
docmd brew fetch $* docmd brew fetch $*
;; ;;
...@@ -2718,6 +2738,10 @@ __epm_filelist_file() ...@@ -2718,6 +2738,10 @@ __epm_filelist_file()
assure_exists dpkg assure_exists dpkg
CMD="dpkg --contents" CMD="dpkg --contents"
;; ;;
eopkg)
assure_exists eopkg
CMD="eopkg --files info"
;;
*) *)
fatal "Have no suitable query command for $PMTYPE" fatal "Have no suitable query command for $PMTYPE"
;; ;;
...@@ -2767,6 +2791,10 @@ __epm_filelist_name() ...@@ -2767,6 +2791,10 @@ __epm_filelist_name()
opkg) opkg)
CMD="opkg files" CMD="opkg files"
;; ;;
eopkg)
docmd eopkg --files -s info $@ | grep "^/"
return
;;
xbps) xbps)
CMD="xbps-query -f" CMD="xbps-query -f"
;; ;;
...@@ -2845,6 +2873,9 @@ case $PMTYPE in ...@@ -2845,6 +2873,9 @@ case $PMTYPE in
dnf-rpm) dnf-rpm)
sudocmd dnf history sudocmd dnf history
;; ;;
eopkg)
sudocmd eopkg history
;;
zypper-rpm) zypper-rpm)
less /var/log/zypp/history less /var/log/zypp/history
;; ;;
...@@ -2982,6 +3013,9 @@ case $PMTYPE in ...@@ -2982,6 +3013,9 @@ case $PMTYPE in
winget) winget)
docmd winget show $pkg_names docmd winget show $pkg_names
;; ;;
eopkg)
docmd eopkg info $pkg_files $pkg_names
;;
appget) appget)
docmd appget view $pkg_names docmd appget view $pkg_names
;; ;;
...@@ -3108,6 +3142,9 @@ epm_install_names() ...@@ -3108,6 +3142,9 @@ epm_install_names()
mpkg) mpkg)
sudocmd mpkg install $@ sudocmd mpkg install $@
return ;; return ;;
eopkg)
sudocmd eopkg $(subst_option nodeps --ignore-dependency) install $@
return ;;
conary) conary)
sudocmd conary update $@ sudocmd conary update $@
return ;; return ;;
...@@ -3211,6 +3248,9 @@ epm_ni_install_names() ...@@ -3211,6 +3248,9 @@ epm_ni_install_names()
opkg) opkg)
sudocmd opkg -force-defaults install $@ sudocmd opkg -force-defaults install $@
return ;; return ;;
eopkg)
sudocmd eopkg --yes-all install $@
return ;;
nix) nix)
sudocmd nix-env --install $@ sudocmd nix-env --install $@
return ;; return ;;
...@@ -3443,6 +3483,9 @@ epm_install_files() ...@@ -3443,6 +3483,9 @@ epm_install_files()
android) android)
sudocmd pm install $files sudocmd pm install $files
return ;; return ;;
eopkg)
sudocmd eopkg install $files
return ;;
emerge) emerge)
sudocmd epm_install_emerge $files sudocmd epm_install_emerge $files
return ;; return ;;
...@@ -3498,6 +3541,9 @@ epm_print_install_command() ...@@ -3498,6 +3541,9 @@ epm_print_install_command()
opkg) opkg)
echo "opkg install $*" echo "opkg install $*"
;; ;;
eopkg)
echo "eopkg install $*"
;;
android) android)
echo "pm install $*" echo "pm install $*"
;; ;;
...@@ -3564,6 +3610,9 @@ epm_print_install_names_command() ...@@ -3564,6 +3610,9 @@ epm_print_install_names_command()
nix) nix)
echo "nix-env --install $*" echo "nix-env --install $*"
return ;; return ;;
eopkg)
echo "eopkg install $*"
return ;;
appget|winget) appget|winget)
echo "$PMTYPE install $*" echo "$PMTYPE install $*"
return ;; return ;;
...@@ -4230,6 +4279,9 @@ case $PMTYPE in ...@@ -4230,6 +4279,9 @@ case $PMTYPE in
conary) conary)
CMD="conary query" CMD="conary query"
;; ;;
eopkg)
CMD="eopkg list-installed"
;;
chocolatey) chocolatey)
CMD="chocolatey list" CMD="chocolatey list"
;; ;;
...@@ -5376,6 +5428,14 @@ __epm_query_name() ...@@ -5376,6 +5428,14 @@ __epm_query_name()
conary) conary)
CMD="conary query" CMD="conary query"
;; ;;
eopkg)
showcmd eopkg blame $1
local str
str="$(a= eopkg blame $1 | grep "^Name")"
[ -n "$str" ] || return 1
echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1-\2-\3|"
return
;;
#homebrew) #homebrew)
# showcmd "brew info $1" # showcmd "brew info $1"
# local HBRESULT # local HBRESULT
...@@ -5428,6 +5488,14 @@ __epm_query_shortname() ...@@ -5428,6 +5488,14 @@ __epm_query_shortname()
conary) conary)
CMD="conary query" CMD="conary query"
;; ;;
eopkg)
showcmd eopkg blame $1
local str
str="$(a= eopkg blame $1 | grep "^Name")"
[ -n "$str" ] || return 1
echo "$str" | sed -e "s|Name[[:space:]]*: \(.*\), version: \(.*\), release: \(.*\)|\1|"
return
;;
homebrew) homebrew)
docmd brew info "$1" >/dev/null 2>/dev/null && echo "$1" && return docmd brew info "$1" >/dev/null 2>/dev/null && echo "$1" && return
return 1 return 1
...@@ -5698,6 +5766,9 @@ epm_reinstall_names() ...@@ -5698,6 +5766,9 @@ epm_reinstall_names()
opkg) opkg)
sudocmd opkg --force-reinstall install $@ sudocmd opkg --force-reinstall install $@
return ;; return ;;
eopkg)
sudocmd eopkg --reinstall install $@
return ;;
slackpkg) slackpkg)
sudocmd_foreach "/usr/sbin/slackpkg reinstall" $@ sudocmd_foreach "/usr/sbin/slackpkg reinstall" $@
return ;; return ;;
...@@ -6533,6 +6604,9 @@ epm_remove_low() ...@@ -6533,6 +6604,9 @@ epm_remove_low()
pacman) pacman)
sudocmd pacman -R $@ sudocmd pacman -R $@
return ;; return ;;
eopkg)
sudocmd eopkg $(subst_option nodeps --ignore-dependency) remove $@
return ;;
appget|winget) appget|winget)
sudocmd $PMTYPE uninstall $@ sudocmd $PMTYPE uninstall $@
return ;; return ;;
...@@ -6598,6 +6672,9 @@ epm_remove_names() ...@@ -6598,6 +6672,9 @@ epm_remove_names()
mpkg) mpkg)
sudocmd mpkg remove $@ sudocmd mpkg remove $@
return ;; return ;;
eopkg)
sudocmd eopkg $(subst_option nodeps --ignore-dependency) remove $@
return ;;
conary) conary)
sudocmd conary erase $@ sudocmd conary erase $@
return ;; return ;;
...@@ -6685,6 +6762,9 @@ epm_remove_nonint() ...@@ -6685,6 +6762,9 @@ epm_remove_nonint()
opkg) opkg)
sudocmd opkg -force-defaults remove $@ sudocmd opkg -force-defaults remove $@
return ;; return ;;
eopkg)
sudocmd eopkg $(subst_option nodeps --ignore-dependency) --yes-all remove $@
return ;;
appget|winget) appget|winget)
sudocmd $PMTYPE uninstall -s $@ sudocmd $PMTYPE uninstall -s $@
return ;; return ;;
...@@ -6725,6 +6805,9 @@ epm_print_remove_command() ...@@ -6725,6 +6805,9 @@ epm_print_remove_command()
opkg) opkg)
echo "opkg remove $*" echo "opkg remove $*"
;; ;;
eopkg)
echo "eopkg remove $*"
;;
aptcyg) aptcyg)
echo "apt-cyg remove $*" echo "apt-cyg remove $*"
;; ;;
...@@ -6996,6 +7079,9 @@ case $PMTYPE in ...@@ -6996,6 +7079,9 @@ case $PMTYPE in
winget) winget)
sudocmd winget source remove "$@" sudocmd winget source remove "$@"
;; ;;
eopkg)
sudocmd eopkg remove-repo "$@"
;;
slackpkg) slackpkg)
info "You need remove repo from /etc/slackpkg/mirrors" info "You need remove repo from /etc/slackpkg/mirrors"
;; ;;
...@@ -7334,11 +7420,14 @@ __epm_repack_to_rpm() ...@@ -7334,11 +7420,14 @@ __epm_repack_to_rpm()
__apply_fix_code $pkgname $tmpbuilddir/$subdir $spec $pkgname __apply_fix_code $pkgname $tmpbuilddir/$subdir $spec $pkgname
# TODO: we need these dirs to be created # TODO: we need these dirs to be created
to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM" to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM"
showcmd rpmbuild --buildroot $tmpbuilddir/$subdir -bb $spec
TARGETARCH=$(epm print info -a | sed -e 's|^x86$|i586|')
showcmd rpmbuild --buildroot $tmpbuilddir/$subdir --target $TARGETARCH -bb $spec
if [ -n "$verbose" ] ; then if [ -n "$verbose" ] ; then
a='' rpmbuild --buildroot $tmpbuilddir/$subdir -bb $spec || fatal a='' rpmbuild --buildroot $tmpbuilddir/$subdir --target $TARGETARCH -bb $spec || fatal
else else
a='' rpmbuild --buildroot $tmpbuilddir/$subdir -bb $spec >/dev/null || fatal a='' rpmbuild --buildroot $tmpbuilddir/$subdir --target $TARGETARCH -bb $spec >/dev/null || fatal
fi fi
# remove copy of source binary package (don't mix with generated) # remove copy of source binary package (don't mix with generated)
rm -f $tmpbuilddir/../$alpkg rm -f $tmpbuilddir/../$alpkg
...@@ -7849,6 +7938,9 @@ case $PMTYPE in ...@@ -7849,6 +7938,9 @@ case $PMTYPE in
winget) winget)
docmd winget source list docmd winget source list
;; ;;
eoget)
docmd eoget list-repo
;;
pacman) pacman)
docmd grep -v -- "^#\|^$" /etc/pacman.conf docmd grep -v -- "^#\|^$" /etc/pacman.conf
;; ;;
...@@ -8000,6 +8092,10 @@ epm_requires_files() ...@@ -8000,6 +8092,10 @@ epm_requires_files()
assure_exists dpkg >/dev/null assure_exists dpkg >/dev/null
a='' docmd dpkg -I $pkg_files | grep "^ *Depends:" | sed "s|^ *Depends:||g" a='' docmd dpkg -I $pkg_files | grep "^ *Depends:" | sed "s|^ *Depends:||g"
;; ;;
eopkg)
showcmd eopkg info $pkg_files
a= eopkg info $pkg_files | grep "^Dependencies" | head -n1 | sed -e "s|Dependencies[[:space:]]*: ||"
;;
*) *)
fatal "Have no suitable command for $PKGTYPE" fatal "Have no suitable command for $PKGTYPE"
;; ;;
...@@ -8086,6 +8182,11 @@ case $PMTYPE in ...@@ -8086,6 +8182,11 @@ case $PMTYPE in
opkg) opkg)
CMD="opkg depends" CMD="opkg depends"
;; ;;
eopkg)
showcmd eopkg info $pkg_names
a= eopkg info $pkg_names | grep "^Dependencies" | sed -e "s|Dependencies[[:space:]]*: ||"
return
;;
xbps) xbps)
CMD="xbps-query -x" CMD="xbps-query -x"
;; ;;
...@@ -8650,6 +8751,9 @@ case $PMTYPE in ...@@ -8650,6 +8751,9 @@ case $PMTYPE in
aura) aura)
CMD="aura -As --" CMD="aura -As --"
;; ;;
eopkg)
CMD="eopkg search --"
;;
yum-rpm) yum-rpm)
CMD="yum search --" CMD="yum search --"
;; ;;
...@@ -8903,6 +9007,9 @@ case $PMTYPE in ...@@ -8903,6 +9007,9 @@ case $PMTYPE in
opkg) opkg)
CMD="opkg -A search" CMD="opkg -A search"
;; ;;
eopkg)
CMD="eopkg search-file"
;;
xbps) xbps)
CMD="xbps-query -Ro" CMD="xbps-query -Ro"
;; ;;
...@@ -9132,6 +9239,44 @@ get_only_installed_packages() ...@@ -9132,6 +9239,44 @@ get_only_installed_packages()
estrlist exclude "$(echo "$installlist" | (skip_installed='yes' filter_out_installed_packages))" "$installlist" estrlist exclude "$(echo "$installlist" | (skip_installed='yes' filter_out_installed_packages))" "$installlist"
} }
__convert_pkgallowscripts_to_regexp()
{
local tmpalf=$(mktemp) || fatal
# copied from eget's filter_glob
# check man glob
# remove commentы and translate glob to regexp
grep -v "^[[:space:]]*#" "$1" | grep -v "^[[:space:]]*$" | sed -e "s|\*|.*|g" -e "s|?|.|g" -e "s|^|^|" -e "s|$|\$|" >$tmpalf
echo "$tmpalf"
}
__epm_package_ok_scripts()
{
local pkg="$1"
local alf="$CONFIGDIR/pkgallowscripts.list"
[ -s "$alf" ] || return 1
local name
name="$(epm print field Name for "$pkg" 2>/dev/null)"
[ -n "$name" ] || return 1
local tmpalf=$(__convert_pkgallowscripts_to_regexp "$alf")
echo "$name" | grep -q -f $tmpalf
local res=$?
rm $tmpalf
return $res
}
__epm_vendor_ok_scripts()
{
local vendor="$1"
local alf="$CONFIGDIR/vendorallowscripts.list"
[ -s "$alf" ] || return 1
[ -n "$vendor" ] || return 1
local tmpalf=$(__convert_pkgallowscripts_to_regexp "$alf")
echo "$vendor" | grep -q -f $tmpalf
local res=$?
rm $tmpalf
return $res
}
__epm_check_vendor() __epm_check_vendor()
{ {
# don't check vendor if there are forced script options # don't check vendor if there are forced script options
...@@ -9149,9 +9294,21 @@ __epm_check_vendor() ...@@ -9149,9 +9294,21 @@ __epm_check_vendor()
[ -n "$rpmversion" ] || continue [ -n "$rpmversion" ] || continue
vendor="$(epm print field Vendor for "$i" 2>/dev/null)" vendor="$(epm print field Vendor for "$i" 2>/dev/null)"
# TODO: check GPG # TODO: check GPG
# check separately to be quiet
[ "$vendor" = "ALT Linux Team" ] && continue [ "$vendor" = "ALT Linux Team" ] && continue
warning "Scripts are disabled for package $i from outside vendor '$vendor'. Use --scripts if you need run scripts from such packages."
if __epm_vendor_ok_scripts "$vendor" ; then
warning "Scripts are ENABLED for package $i from outside vendor '$vendor' (this vendor is listed in $CONFIGDIR/vendorallowscripts.list). Use --noscripts if you need disable scripts in such packages."
continue
fi
if __epm_package_ok_scripts "$i" ; then
warning "Scripts are ENABLED for package $i from outside vendor '$vendor' (the package is listed in $CONFIGDIR/pkgallowscripts.list). Use --noscripts if you need disable scripts in such packages."
continue
fi
warning "Scripts are DISABLED for package $i from outside vendor '$vendor'. Use --scripts if you need run scripts from such packages."
noscripts="--noscripts" noscripts="--noscripts"
done done
} }
...@@ -9298,6 +9455,9 @@ EOF ...@@ -9298,6 +9455,9 @@ EOF
urpm-rpm) urpm-rpm)
CMD="urpmi --test --auto" CMD="urpmi --test --auto"
;; ;;
eopkg)
CMD="eopkg --dry-run install"
;;
zypper-rpm) zypper-rpm)
if ! __use_zypper_dry_run >/dev/null ; then if ! __use_zypper_dry_run >/dev/null ; then
fatal "zypper is too old: does not support --dry-run" fatal "zypper is too old: does not support --dry-run"
...@@ -9612,6 +9772,9 @@ case $PMTYPE in ...@@ -9612,6 +9772,9 @@ case $PMTYPE in
opkg) opkg)
sudocmd opkg update sudocmd opkg update
;; ;;
eopkg)
sudocmd eopkg update-repo
;;
apk) apk)
sudocmd apk update sudocmd apk update
;; ;;
...@@ -9672,6 +9835,12 @@ epm_upgrade() ...@@ -9672,6 +9835,12 @@ epm_upgrade()
fi fi
fi fi
# Solus supports upgrade for a package (with all dependencies)
if [ -n "$1" ] && [ "$DISTRNAME" = "Solus" ] ; then
sudocmd eopkg upgrade "$@"
return
fi
info "Running command for upgrade packages" info "Running command for upgrade packages"
case $PMTYPE in case $PMTYPE in
...@@ -9753,6 +9922,9 @@ epm_upgrade() ...@@ -9753,6 +9922,9 @@ epm_upgrade()
opkg) opkg)
CMD="opkg upgrade" CMD="opkg upgrade"
;; ;;
eopkg)
CMD="eopkg upgrade"
;;
slackpkg) slackpkg)
CMD="/usr/sbin/slackpkg upgrade-all" CMD="/usr/sbin/slackpkg upgrade-all"
;; ;;
...@@ -9847,6 +10019,12 @@ case $PMTYPE in ...@@ -9847,6 +10019,12 @@ case $PMTYPE in
opkg) opkg)
CMD="opkg whatdepends" CMD="opkg whatdepends"
;; ;;
eopkg)
showcmd eopkg info $pkg
# eopkg info prints it only from repo info
a= eopkg info $pkg | grep "^Reverse Dependencies" | sed -e "s|Reverse Dependencies[[:space:]]*: ||" | grep -v "^$"
return
;;
xbps) xbps)
CMD="xbps-query -X" CMD="xbps-query -X"
;; ;;
...@@ -10010,6 +10188,9 @@ case $DISTRIB_ID in ...@@ -10010,6 +10188,9 @@ case $DISTRIB_ID in
#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg #which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
#hascommand snappy && CMD=snappy #hascommand snappy && CMD=snappy
;; ;;
Solus)
CMD="eopkg"
;;
Mandriva) Mandriva)
CMD="urpm-rpm" CMD="urpm-rpm"
;; ;;
...@@ -10113,6 +10294,7 @@ pkgtype() ...@@ -10113,6 +10294,7 @@ pkgtype()
voidlinux) echo "xbps" ;; voidlinux) echo "xbps" ;;
openwrt) echo "ipk" ;; openwrt) echo "ipk" ;;
cygwin) echo "tar.xz" ;; cygwin) echo "tar.xz" ;;
solus) echo "eopkg" ;;
*) *)
case $(pkgmanager) in case $(pkgmanager) in
*-dpkg) *-dpkg)
...@@ -11845,7 +12027,7 @@ Examples: ...@@ -11845,7 +12027,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.29.1 Telegram: https://t.me/useepm https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.30.0 Telegram: https://t.me/useepm 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-2023" echo "Copyright (c) Etersoft 2012-2023"
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."
...@@ -11855,7 +12037,7 @@ print_version() ...@@ -11855,7 +12037,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.29.1 EPMVERSION=3.30.0
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
...@@ -11884,7 +12066,7 @@ quoted_args= ...@@ -11884,7 +12066,7 @@ quoted_args=
direct_args= direct_args=
# load system wide config # load system wide config
[ -f /etc/eepm/eepm.conf ] && . /etc/eepm/eepm.conf [ -f $CONFIGDIR/eepm.conf ] && . $CONFIGDIR/eepm.conf
case $PROGNAME in case $PROGNAME in
...@@ -11955,13 +12137,13 @@ check_command() ...@@ -11955,13 +12137,13 @@ check_command()
# HELPCMD: PART: Base commands: # HELPCMD: PART: Base commands:
case $1 in case $1 in
-i|install|add|i) # HELPCMD: install package(s) from remote repositories or from local file -i|install|add|i|it) # HELPCMD: install package(s) from remote repositories or from local file
epm_cmd=install epm_cmd=install
;; ;;
-e|-P|rm|del|remove|delete|uninstall|erase|purge|e) # HELPCMD: remove (delete) package(s) from the database and the system -e|-P|rm|del|remove|delete|uninstall|erase|purge|e) # HELPCMD: remove (delete) package(s) from the database and the system
epm_cmd=remove epm_cmd=remove
;; ;;
-s|search|s|find) # HELPCMD: search in remote package repositories -s|search|s|find|sr) # HELPCMD: search in remote package repositories
epm_cmd=search epm_cmd=search
;; ;;
-qp|qp|query_package) # HELPCMD: search in the list of installed packages -qp|qp|query_package) # HELPCMD: search in the list of installed packages
...@@ -11984,7 +12166,7 @@ check_command() ...@@ -11984,7 +12166,7 @@ check_command()
installed) # HELPCMD: check presence of package(s) (like -q with --quiet) installed) # HELPCMD: check presence of package(s) (like -q with --quiet)
epm_cmd=installed epm_cmd=installed
;; ;;
-sf|sf|filesearch) # HELPCMD: search in which package a file is included -sf|sf|filesearch|search-file) # HELPCMD: search in which package a file is included
epm_cmd=search_file epm_cmd=search_file
;; ;;
-ql|ql|filelist|get-files) # HELPCMD: print package file list -ql|ql|filelist|get-files) # HELPCMD: print package file list
...@@ -12019,7 +12201,7 @@ check_command() ...@@ -12019,7 +12201,7 @@ check_command()
conflicts) # HELPCMD: print package conflicts conflicts) # HELPCMD: print package conflicts
epm_cmd=conflicts epm_cmd=conflicts
;; ;;
-qa|qa|-l|list|ls|packages) # HELPCMD: print list of installed package(s) -qa|qa|-l|list|ls|packages|list-installed|li) # HELPCMD: print list of installed package(s)
epm_cmd=packages epm_cmd=packages
;; ;;
programs) # HELPCMD: print list of installed GUI program(s) (they have .desktop files) programs) # HELPCMD: print list of installed GUI program(s) (they have .desktop files)
...@@ -12034,7 +12216,7 @@ check_command() ...@@ -12034,7 +12216,7 @@ check_command()
;; ;;
# HELPCMD: PART: Repository control: # HELPCMD: PART: Repository control:
update) # HELPCMD: update remote package repository databases update|update-repo|ur) # HELPCMD: update remote package repository databases
epm_cmd=update epm_cmd=update
direct_args=1 direct_args=1
;; ;;
...@@ -12042,7 +12224,7 @@ check_command() ...@@ -12042,7 +12224,7 @@ check_command()
epm_cmd=addrepo epm_cmd=addrepo
direct_args=1 direct_args=1
;; ;;
repolist|sl|rl|listrepo|repo-list) # HELPCMD: print repo list repolist|sl|rl|listrepo|repo-list|list-repo|lr) # HELPCMD: print repo list
epm_cmd=repolist epm_cmd=repolist
direct_args=1 direct_args=1
;; ;;
...@@ -12050,7 +12232,7 @@ check_command() ...@@ -12050,7 +12232,7 @@ check_command()
epm_cmd=repofix epm_cmd=repofix
direct_args=1 direct_args=1
;; ;;
removerepo|rr) # HELPCMD: remove package repo (shortcut for epm repo remove) removerepo|remove-repo|rr) # HELPCMD: remove package repo (shortcut for epm repo remove)
epm_cmd=removerepo epm_cmd=removerepo
direct_args=1 direct_args=1
;; ;;
...@@ -12080,7 +12262,7 @@ check_command() ...@@ -12080,7 +12262,7 @@ check_command()
;; ;;
# HELPCMD: PART: Other commands: # HELPCMD: PART: Other commands:
clean) # HELPCMD: clean local package cache clean|delete-cache|dc) # HELPCMD: clean local package cache
epm_cmd=clean epm_cmd=clean
direct_args=1 direct_args=1
;; ;;
...@@ -12097,10 +12279,10 @@ check_command() ...@@ -12097,10 +12279,10 @@ check_command()
history) # HELPCMD: show a log of actions taken by the software management history) # HELPCMD: show a log of actions taken by the software management
epm_cmd=history epm_cmd=history
;; ;;
autoorphans|--orphans) # HELPCMD: remove all packages not from the repository autoorphans|--orphans|remove-orphans) # HELPCMD: remove all packages not from the repository
epm_cmd=autoorphans epm_cmd=autoorphans
;; ;;
upgrade|dist-upgrade) # HELPCMD: performs upgrades of package software distributions upgrade|up|dist-upgrade) # HELPCMD: performs upgrades of package software distributions
epm_cmd=upgrade epm_cmd=upgrade
;; ;;
Upgrade) # HELPCMD: force update package base, then run upgrade Upgrade) # HELPCMD: force update package base, then run upgrade
...@@ -12110,7 +12292,7 @@ check_command() ...@@ -12110,7 +12292,7 @@ check_command()
downgrade) # HELPCMD: downgrade [all] packages to the repo state downgrade) # HELPCMD: downgrade [all] packages to the repo state
epm_cmd=downgrade epm_cmd=downgrade
;; ;;
download) # HELPCMD: download package(s) file to the current dir download|fetch|fc) # HELPCMD: download package(s) file to the current dir
epm_cmd=download epm_cmd=download
;; ;;
# TODO: replace with install --simulate # TODO: replace with install --simulate
......
...@@ -1447,6 +1447,9 @@ case $DISTRIB_ID in ...@@ -1447,6 +1447,9 @@ case $DISTRIB_ID in
#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg #which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
#hascommand snappy && CMD=snappy #hascommand snappy && CMD=snappy
;; ;;
Solus)
CMD="eopkg"
;;
Mandriva) Mandriva)
CMD="urpm-rpm" CMD="urpm-rpm"
;; ;;
...@@ -1550,6 +1553,7 @@ pkgtype() ...@@ -1550,6 +1553,7 @@ pkgtype()
voidlinux) echo "xbps" ;; voidlinux) echo "xbps" ;;
openwrt) echo "ipk" ;; openwrt) echo "ipk" ;;
cygwin) echo "tar.xz" ;; cygwin) echo "tar.xz" ;;
solus) echo "eopkg" ;;
*) *)
case $(pkgmanager) in case $(pkgmanager) in
*-dpkg) *-dpkg)
...@@ -2371,7 +2375,7 @@ print_version() ...@@ -2371,7 +2375,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.29.1 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.30.0 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