Skip to content

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

commit packed 3.10.4

parent 3c1f1f2a
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 42 deletions
packed/epm.sh
View file @ cfe12d3b
...@@ -301,10 +301,18 @@ set_sudo() ...@@ -301,10 +301,18 @@ set_sudo()
return return
fi fi
# use sudo if one is tuned and tuned without password # if input is a console
if ! sudo -l -n >/dev/null 2>/dev/null ; then if inputisatty && isatty && isatty2 ; then
SUDO="fatal 'Can't use sudo (only without password sudo is supported). Please run epm under root.'" if ! sudo -l >/dev/null ; then
return SUDO="fatal 'Can't use sudo (only without password sudo is supported). Please run epm under root.'"
return
fi
else
# use sudo if one is tuned and tuned without password
if ! sudo -l -n >/dev/null 2>/dev/null ; then
SUDO="fatal 'Can't use sudo (only without password sudo is supported). Please run epm under root.'"
return
fi
fi fi
SUDO="sudo --" SUDO="sudo --"
...@@ -1076,21 +1084,25 @@ __epm_autoremove_altrpm_lib() ...@@ -1076,21 +1084,25 @@ __epm_autoremove_altrpm_lib()
local opt="$1" local opt="$1"
local libgrep='' local libgrep=''
info info
if [ "$opt" = "libs" ] ; then case "$opt" in
info "Removing all non -devel/-debuginfo libs packages not need by anything..." libs)
local develrule='-(devel|devel-static)$' info "Removing all non -devel/-debuginfo libs packages not need by anything..."
libgrep='^(lib|bzlib|zlib)' local develrule='-(devel|devel-static)$'
elif [ "$opt" = "i586-libs" ] ; then libgrep='^(lib|bzlib|zlib)'
info "Removing all non -devel/-debuginfo i586-libs packages not need by anything..." ;;
local develrule='-(devel|devel-static)$' i586-libs)
libgrep='^(i586-lib|i586-bzlib|i586-zlib)' info "Removing all non -devel/-debuginfo i586-libs packages not need by anything..."
elif [ "$opt" = "devel" ] ; then local develrule='-(devel|devel-static)$'
info "Removing all non -debuginfo libs packages (-devel too) not need by anything..." libgrep='^(i586-lib|i586-bzlib|i586-zlib)'
local develrule='-(NONONO)$' ;;
libgrep='^(lib|bzlib|zlib)' devel)
else info "Removing all non -debuginfo libs packages (-devel too) not need by anything..."
fatal "Internal error: unsupported opt $opt" local develrule='-(NONONO)$'
fi libgrep='^(lib|bzlib|zlib)'
;;
*)
fatal "Internal error: unsupported opt $opt"
esac
# https://www.altlinux.org/APT_в_ALT_Linux/Советы_по_использованию#apt-cache_list-nodeps # https://www.altlinux.org/APT_в_ALT_Linux/Советы_по_использованию#apt-cache_list-nodeps
showcmd "apt-cache list-nodeps | grep -E -- \"$libgrep\"" showcmd "apt-cache list-nodeps | grep -E -- \"$libgrep\""
...@@ -1121,7 +1133,7 @@ __epm_autoremove_altrpm_lib() ...@@ -1121,7 +1133,7 @@ __epm_autoremove_altrpm_lib()
if [ -n "$flag" ] ; then if [ -n "$flag" ] ; then
info "" info ""
info "call again for next cycle until all libs will be removed" info "call again for next cycle until all libs will be removed"
__epm_autoremove_altrpm_lib $nodevel __epm_autoremove_altrpm_lib $opt
fi fi
return 0 return 0
...@@ -5570,9 +5582,17 @@ epm_remove_old_kernels() ...@@ -5570,9 +5582,17 @@ epm_remove_old_kernels()
__epm_removerepo_alt_grepremove() __epm_removerepo_alt_grepremove()
{ {
local rp local rp
epm repolist | grep -E "$1" | while read rp ; do local flag=0
sudocmd apt-repo $dryrun rm "$rp" (quiet=1 epm repolist) 2>/dev/null | grep -E "$1" | while read rp ; do
[ -n "$dryrun" ] || apt-repo --dry-run rm "$rp"
if [ -n "$verbose" ] ; then
sudocmd apt-repo $dryrun rm "$rp"
else
$SUDO apt-repo $dryrun rm "$rp"
fi
flag=1
done done
[ "$flag" = "0" ] && warning "Can't find '$1' in the repos (see 'epm repolist' output)"
} }
__epm_removerepo_alt() __epm_removerepo_alt()
...@@ -5610,7 +5630,7 @@ __epm_removerepo_alt() ...@@ -5610,7 +5630,7 @@ __epm_removerepo_alt()
__epm_removerepo_alt_grepremove " repo/$1/" __epm_removerepo_alt_grepremove " repo/$1/"
;; ;;
*) *)
sudocmd apt-repo $dryrun rm "$*" __epm_removerepo_alt_grepremove "$*"
;; ;;
esac esac
...@@ -6234,34 +6254,69 @@ esac ...@@ -6234,34 +6254,69 @@ esac
# File bin/epm-repolist: # File bin/epm-repolist:
print_apt_sources_list() __print_apt_sources_list()
{ {
local i local i
for i in $@ ; do for i in $@ ; do
test -r "$i" || continue test -r "$i" || continue
#echo grep -v -- "^.*#" $i
#echo "$i:"
grep -v -- "^#" $i
done | grep -v -- "^ *\$" done | grep -v -- "^ *\$"
} }
__print_apt_sources_list_list()
{
local i
for i in $@ ; do
test -r "$i" || continue
grep -v -- "^.*#" $i | grep -v -- "^ *\$" | grep -q . && echo "$i"
done
}
__info_cyan()
{
set_boldcolor $CYAN
echo "$*" >&2
restore_color
}
__print_apt_sources_list_verbose()
{
local i
for i in $@ ; do
test -r "$i" || continue
grep -v -- "^.*#" $i | grep -v -- "^ *\$" | grep -q . && __info_cyan "$i:" || continue
grep -v -- "^.*#" $i | grep -v -- "^ *\$" | sed -e 's|^| |'
done
}
print_apt_sources_list()
{
local LISTS='/etc/apt/sources.list /etc/apt/sources.list.d/*.list'
if [ -n "$quiet" ] ; then
__print_apt_sources_list $LISTS
else
__print_apt_sources_list_verbose $LISTS
fi
}
epm_repolist() epm_repolist()
{ {
case $PMTYPE in case $PMTYPE in
apt-rpm) apt-rpm)
assure_exists apt-repo #assure_exists apt-repo
if tasknumber "$pkg_names" >/dev/null ; then if tasknumber "$pkg_names" >/dev/null ; then
get_task_packages $pkg_names get_task_packages $pkg_names
else else
docmd apt-repo list print_apt_sources_list
#docmd apt-repo list
fi fi
;; ;;
deepsolver-rpm) deepsolver-rpm)
docmd ds-conf docmd ds-conf
;; ;;
apt-dpkg|aptitude-dpkg) apt-dpkg|aptitude-dpkg)
showcmd cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list print_apt_sources_list
print_apt_sources_list /etc/apt/sources.list /etc/apt/sources.list.d/*.list
;; ;;
yum-rpm) yum-rpm)
docmd yum repolist -v docmd yum repolist -v
...@@ -7347,7 +7402,7 @@ __init_contents_index_list() ...@@ -7347,7 +7402,7 @@ __init_contents_index_list()
__add_to_contents_index_list() __add_to_contents_index_list()
{ {
echo " $1 -> $2" [ -n "$quiet" ] || echo " $1 -> $2"
echo "$2" >>$ALT_CONTENTS_INDEX_LIST echo "$2" >>$ALT_CONTENTS_INDEX_LIST
} }
...@@ -7368,7 +7423,7 @@ update_alt_contents_index() ...@@ -7368,7 +7423,7 @@ update_alt_contents_index()
# TODO: fix for Etersoft/LINUX@Etersoft # TODO: fix for Etersoft/LINUX@Etersoft
# TODO: fix for rsync # TODO: fix for rsync
info "Retrieving contents_index ..." info "Retrieving contents_index ..."
epm_repolist | grep -v " task$" | grep -E "rpm.*(ftp://|http://|https://|rsync://|file:/)" | sed -e "s@^rpm.*\(ftp://\|http://\|https://\)@rsync://@g" | sed -e "s@^rpm.*\(file:\)@@g" | while read -r URL1 URL2 component ; do (quiet=1 epm_repolist) | grep -v " task$" | grep -E "rpm.*(ftp://|http://|https://|rsync://|file:/)" | sed -e "s@^rpm.*\(ftp://\|http://\|https://\)@rsync://@g" | sed -e "s@^rpm.*\(file:\)@@g" | while read -r URL1 URL2 component ; do
[ "$component" = "debuginfo" ] && continue [ "$component" = "debuginfo" ] && continue
URL="$URL1/$URL2" URL="$URL1/$URL2"
if echo "$URL" | grep -q "^/" ; then if echo "$URL" | grep -q "^/" ; then
...@@ -8044,9 +8099,13 @@ epm_whatdepends() ...@@ -8044,9 +8099,13 @@ epm_whatdepends()
case $PMTYPE in case $PMTYPE in
apt-rpm) apt-rpm)
if [ -n "$short" ] ; then if [ -z "$verbose" ] ; then
showcmd apt-cache whatdepends $pkg showcmd apt-cache whatdepends $pkg
a= apt-cache whatdepends $pkg | grep "^ [^ ]" | sed -e "s|[0-9]*:||" | grep -E -v "(i586-|-debuginfo)" if [ -n "$short" ] ; then
a= apt-cache whatdepends $pkg | grep "^ [^ ]" | sed -e "s|[0-9]*:||" | grep -E -v "(i586-|-debuginfo)" | sed -e 's|[@:].*||' -e "s|-[0-9].*||g" -e 's|^ *||' -e 's/\.32bit//g'
else
a= apt-cache whatdepends $pkg | grep "^ [^ ]" | sed -e "s|[0-9]*:||" | grep -E -v "(i586-|-debuginfo)"
fi
return return
fi fi
CMD="apt-cache whatdepends" CMD="apt-cache whatdepends"
...@@ -9740,7 +9799,7 @@ Examples: ...@@ -9740,7 +9799,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.10.2 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.10.4 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-2020" echo "Copyright (c) Etersoft 2012-2020"
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."
...@@ -9750,7 +9809,7 @@ print_version() ...@@ -9750,7 +9809,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.10.2 EPMVERSION=3.10.4
verbose= verbose=
quiet= quiet=
nodeps= nodeps=
......
packed/serv.sh
View file @ cfe12d3b
...@@ -292,10 +292,18 @@ set_sudo() ...@@ -292,10 +292,18 @@ set_sudo()
return return
fi fi
# use sudo if one is tuned and tuned without password # if input is a console
if ! sudo -l -n >/dev/null 2>/dev/null ; then if inputisatty && isatty && isatty2 ; then
SUDO="fatal 'Can't use sudo (only without password sudo is supported). Please run epm under root.'" if ! sudo -l >/dev/null ; then
return SUDO="fatal 'Can't use sudo (only without password sudo is supported). Please run epm under root.'"
return
fi
else
# use sudo if one is tuned and tuned without password
if ! sudo -l -n >/dev/null 2>/dev/null ; then
SUDO="fatal 'Can't use sudo (only without password sudo is supported). Please run epm under root.'"
return
fi
fi fi
SUDO="sudo --" SUDO="sudo --"
...@@ -2842,7 +2850,7 @@ print_version() ...@@ -2842,7 +2850,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.10.2 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.10.4 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-2019" echo "Copyright (c) Etersoft 2012-2019"
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