Skip to content

E
eepm
Commit 5299c2f2 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

commit packed 3.21.6

parent a848c088
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 16 deletions
packed/epm.sh
View file @ 5299c2f2
...@@ -1345,7 +1345,7 @@ esac ...@@ -1345,7 +1345,7 @@ esac
case $PMTYPE in case $PMTYPE in
apt-dpkg|aptitude-dpkg) apt-dpkg|aptitude-dpkg)
sudocmd apt-get autoremove $dryrun sudocmd apt-get autoremove local $(subst_option non_interactive -y) $dryrun
;; ;;
aura) aura)
if [ -n "$dryrun" ] ; then if [ -n "$dryrun" ] ; then
...@@ -2965,10 +2965,10 @@ epm_ni_install_names() ...@@ -2965,10 +2965,10 @@ epm_ni_install_names()
sudocmd aptitude -y install $@ sudocmd aptitude -y install $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix) sudocmd yum -y --allowerasing $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
return ;; return ;;
dnf-rpm) dnf-rpm)
sudocmd dnf -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix) sudocmd dnf -y --allowerasing $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
return ;; return ;;
urpm-rpm) urpm-rpm)
sudocmd urpmi --auto $URPMOPTIONS $@ sudocmd urpmi --auto $URPMOPTIONS $@
...@@ -3292,10 +3292,10 @@ epm_print_install_names_command() ...@@ -3292,10 +3292,10 @@ epm_print_install_names_command()
echo "aptitude -y install $*" echo "aptitude -y install $*"
return ;; return ;;
yum-rpm) yum-rpm)
echo "yum -y $YUMOPTIONS install $*" echo "yum -y $YUMOPTIONS --allowerasing install $*"
return ;; return ;;
dnf-rpm) dnf-rpm)
echo "dnf -y $YUMOPTIONS install $*" echo "dnf -y $YUMOPTIONS --allowerasing install $*"
return ;; return ;;
urpm-rpm) urpm-rpm)
echo "urpmi --auto $URPMOPTIONS $*" echo "urpmi --auto $URPMOPTIONS $*"
...@@ -4706,8 +4706,9 @@ __epm_get_hilevel_nameform() ...@@ -4706,8 +4706,9 @@ __epm_get_hilevel_nameform()
yum-rpm|dnf-rpm) yum-rpm|dnf-rpm)
# just use strict version with Epoch and Serial # just use strict version with Epoch and Serial
local pkg local pkg
pkg=$(rpm -q --queryformat "%{EPOCH}:%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1) #pkg=$(rpm -q --queryformat "%{EPOCH}:%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1)
echo $pkg | grep -q "(none)" && pkg=$(rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1) #echo $pkg | grep -q "(none)" && pkg=$(rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1)
pkg=$(rpm -q --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" -- $1)
echo $pkg echo $pkg
return return
;; ;;
...@@ -5922,6 +5923,8 @@ epm_remove_names() ...@@ -5922,6 +5923,8 @@ epm_remove_names()
warmup_bases warmup_bases
local APTOPTIONS="$(subst_option non_interactive -y)"
case $PMTYPE in case $PMTYPE in
apt-dpkg) apt-dpkg)
sudocmd apt-get remove --purge $APTOPTIONS $@ sudocmd apt-get remove --purge $APTOPTIONS $@
...@@ -9241,7 +9244,6 @@ case $DISTRIB_ID in ...@@ -9241,7 +9244,6 @@ case $DISTRIB_ID in
ROSA) ROSA)
CMD="dnf-rpm" CMD="dnf-rpm"
hascommand dnf || CMD="yum-rpm" hascommand dnf || CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/7" ] && CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm" [ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm"
;; ;;
FreeBSD|NetBSD|OpenBSD|Solaris) FreeBSD|NetBSD|OpenBSD|Solaris)
...@@ -9254,7 +9256,7 @@ case $DISTRIB_ID in ...@@ -9254,7 +9256,7 @@ case $DISTRIB_ID in
ArchLinux) ArchLinux)
CMD="pacman" CMD="pacman"
;; ;;
Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|Scientific|GosLinux|Amzn|RedOS) Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|RELS|Scientific|GosLinux|Amzn|RedOS)
CMD="dnf-rpm" CMD="dnf-rpm"
hascommand dnf || CMD="yum-rpm" hascommand dnf || CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD="yum-rpm" [ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD="yum-rpm"
...@@ -9376,9 +9378,15 @@ normalize_name() ...@@ -9376,9 +9378,15 @@ normalize_name()
"Red Hat Enterprise Linux Server") "Red Hat Enterprise Linux Server")
echo "RHEL" echo "RHEL"
;; ;;
"ROSA Enterprise Linux Desktop"|"ROSA Enterprise Linux Server") "ROSA Chrome Desktop")
echo "ROSA" echo "ROSA"
;; ;;
"ROSA Enterprise Linux Desktop")
echo "RELS"
;;
"ROSA Enterprise Linux Server")
echo "RELS"
;;
*) *)
#echo "${1// /}" #echo "${1// /}"
firstupper "$1" | sed -e "s/ //g" -e 's|(.*||' firstupper "$1" | sed -e "s/ //g" -e 's|(.*||'
...@@ -10940,7 +10948,7 @@ Examples: ...@@ -10940,7 +10948,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.21.5 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.21.6 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."
...@@ -10950,7 +10958,7 @@ print_version() ...@@ -10950,7 +10958,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.5 EPMVERSION=3.21.6
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
packed/serv.sh
View file @ 5299c2f2
...@@ -1413,7 +1413,6 @@ case $DISTRIB_ID in ...@@ -1413,7 +1413,6 @@ case $DISTRIB_ID in
ROSA) ROSA)
CMD="dnf-rpm" CMD="dnf-rpm"
hascommand dnf || CMD="yum-rpm" hascommand dnf || CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/7" ] && CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm" [ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm"
;; ;;
FreeBSD|NetBSD|OpenBSD|Solaris) FreeBSD|NetBSD|OpenBSD|Solaris)
...@@ -1426,7 +1425,7 @@ case $DISTRIB_ID in ...@@ -1426,7 +1425,7 @@ case $DISTRIB_ID in
ArchLinux) ArchLinux)
CMD="pacman" CMD="pacman"
;; ;;
Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|Scientific|GosLinux|Amzn|RedOS) Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|RELS|Scientific|GosLinux|Amzn|RedOS)
CMD="dnf-rpm" CMD="dnf-rpm"
hascommand dnf || CMD="yum-rpm" hascommand dnf || CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD="yum-rpm" [ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD="yum-rpm"
...@@ -1548,9 +1547,15 @@ normalize_name() ...@@ -1548,9 +1547,15 @@ normalize_name()
"Red Hat Enterprise Linux Server") "Red Hat Enterprise Linux Server")
echo "RHEL" echo "RHEL"
;; ;;
"ROSA Enterprise Linux Desktop"|"ROSA Enterprise Linux Server") "ROSA Chrome Desktop")
echo "ROSA" echo "ROSA"
;; ;;
"ROSA Enterprise Linux Desktop")
echo "RELS"
;;
"ROSA Enterprise Linux Server")
echo "RELS"
;;
*) *)
#echo "${1// /}" #echo "${1// /}"
firstupper "$1" | sed -e "s/ //g" -e 's|(.*||' firstupper "$1" | sed -e "s/ //g" -e 's|(.*||'
...@@ -2255,7 +2260,7 @@ print_version() ...@@ -2255,7 +2260,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.5 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.21.6 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