Commit 53bca0b2 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.27.2

parent 62709c4c
...@@ -286,8 +286,12 @@ clean_store_output() ...@@ -286,8 +286,12 @@ clean_store_output()
epm() epm()
{ {
[ -n "$PROGNAME" ] || fatal "Can't use epm call from the piped script" if [ -n "$PROGNAME" ] ; then
#|| fatal "Can't use epm call from the piped script"
bash $PROGDIR/$PROGNAME --inscript "$@" bash $PROGDIR/$PROGNAME --inscript "$@"
else
epm_main --inscript "$@"
fi
} }
sudoepm() sudoepm()
...@@ -2523,7 +2527,7 @@ epm_download() ...@@ -2523,7 +2527,7 @@ epm_download()
check_url_is_accessible() check_url_is_accessible()
{ {
local res local res
epm tool eget --check "$1" eget --check "$1"
} }
update_url_if_need_mirrored() update_url_if_need_mirrored()
...@@ -10552,6 +10556,12 @@ if [ "$1" = "--latest" ] ; then ...@@ -10552,6 +10556,12 @@ if [ "$1" = "--latest" ] ; then
shift shift
fi fi
SECONDLATEST=''
if [ "$1" = "--second-latest" ] ; then
SECONDLATEST="$1"
shift
fi
fatal() fatal()
{ {
echo "$*" >&2 echo "$*" >&2
...@@ -10568,6 +10578,10 @@ filter_glob() ...@@ -10568,6 +10578,10 @@ filter_glob()
filter_order() filter_order()
{ {
if [ -n "$SECONDLATEST" ] ; then
sort -V | tail -n2 | head -n1
return
fi
[ -z "$LATEST" ] && cat && return [ -z "$LATEST" ] && cat && return
sort -V | tail -n1 sort -V | tail -n1
} }
...@@ -10602,6 +10616,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then ...@@ -10602,6 +10616,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
echo " --list - print files from url with mask" echo " --list - print files from url with mask"
echo " --check - check if URL is accessible (returns HTTP 200 OK)" echo " --check - check if URL is accessible (returns HTTP 200 OK)"
echo " --latest - print only latest version of a file" echo " --latest - print only latest version of a file"
echo " --second-latest - print only second to latest version of a file"
echo echo
echo "eget supports --list and download for https://github.com/owner/project urls" echo "eget supports --list and download for https://github.com/owner/project urls"
echo echo
...@@ -11312,7 +11327,7 @@ Examples: ...@@ -11312,7 +11327,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.27.1 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.27.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."
...@@ -11322,7 +11337,7 @@ print_version() ...@@ -11322,7 +11337,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.27.1 EPMVERSION=3.27.2
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
...@@ -276,8 +276,12 @@ clean_store_output() ...@@ -276,8 +276,12 @@ clean_store_output()
epm() epm()
{ {
[ -n "$PROGNAME" ] || fatal "Can't use epm call from the piped script" if [ -n "$PROGNAME" ] ; then
#|| fatal "Can't use epm call from the piped script"
bash $PROGDIR/$PROGNAME --inscript "$@" bash $PROGDIR/$PROGNAME --inscript "$@"
else
epm_main --inscript "$@"
fi
} }
sudoepm() sudoepm()
...@@ -2323,7 +2327,7 @@ print_version() ...@@ -2323,7 +2327,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.27.1 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.27.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