Commit 6a5fe473 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.21.1

parent e9f1f8f2
...@@ -202,6 +202,16 @@ realpath() ...@@ -202,6 +202,16 @@ realpath()
} }
fi fi
make_filepath()
{
local i
for i in "$@" ; do
[ -f "$i" ] || continue
echo "$i" | grep -q "/" && echo "$i" && continue
echo "./$i"
done
}
get_firstarg() get_firstarg()
{ {
echon "$1" echon "$1"
...@@ -3103,7 +3113,8 @@ epm_install_files() ...@@ -3103,7 +3113,8 @@ epm_install_files()
# return OK if all is OK # return OK if all is OK
[ "$RES" = "0" ] && return $RES [ "$RES" = "0" ] && return $RES
epm_install_names "$@" # are there apt that don't support dpkg files to install?
epm_install_names $(make_filepath "$@")
return return
# TODO: workaround with epm-check needed only for very old apt # TODO: workaround with epm-check needed only for very old apt
...@@ -10898,7 +10909,7 @@ Examples: ...@@ -10898,7 +10909,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.21.0 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.21.1 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."
...@@ -10908,7 +10919,7 @@ print_version() ...@@ -10908,7 +10919,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.0 EPMVERSION=3.21.1
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
...@@ -193,6 +193,16 @@ realpath() ...@@ -193,6 +193,16 @@ realpath()
} }
fi fi
make_filepath()
{
local i
for i in "$@" ; do
[ -f "$i" ] || continue
echo "$i" | grep -q "/" && echo "$i" && continue
echo "./$i"
done
}
get_firstarg() get_firstarg()
{ {
echon "$1" echon "$1"
...@@ -2237,7 +2247,7 @@ print_version() ...@@ -2237,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.0 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.21.1 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