Commit 00b12054 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.22.1

parent aba47195
...@@ -6903,6 +6903,9 @@ __repofix_filter_vendor() ...@@ -6903,6 +6903,9 @@ __repofix_filter_vendor()
c9) c9)
br="cert9" br="cert9"
;; ;;
Sisyphus
br="alt"
;;
esac esac
echo "$br" echo "$br"
} }
...@@ -6947,10 +6950,16 @@ epm_reposwitch() ...@@ -6947,10 +6950,16 @@ epm_reposwitch()
{ {
local TO="$1" local TO="$1"
[ -n "$TO" ] || fatal "run repo switch with arg (p9, p10, Sisyphus)" [ -n "$TO" ] || fatal "run repo switch with arg (p9, p10, Sisyphus)"
__replace_alt_version_in_repo "Sisyphus/" "$TO/branch/" [ "$TO" = "sisyphus" ] && TO="Sisyphus"
__replace_alt_version_in_repo "[tpc][5-9]\.?[0-9]?/branch/" "$TO/branch/" if [ "$TO" = "Sisyphus" ] ; then
if [ "$TO" != "p10" ] ; then __replace_alt_version_in_repo "[tpc][5-9]\.?[0-9]?/branch/" "$TO/"
__replace_alt_version_in_repo "p10\.?[0-9]?/branch/" "$TO/branch/" __replace_alt_version_in_repo "p10\.?[0-9]?/branch/" "$TO/"
else
__replace_alt_version_in_repo "Sisyphus/" "$TO/branch/"
__replace_alt_version_in_repo "[tpc][5-9]\.?[0-9]?/branch/" "$TO/branch/"
if [ "$TO" != "p10" ] ; then
__replace_alt_version_in_repo "p10\.?[0-9]?/branch/" "$TO/branch/"
fi
fi fi
__alt_repofix "$TO" __alt_repofix "$TO"
...@@ -11037,7 +11046,7 @@ Examples: ...@@ -11037,7 +11046,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.22.0 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.22.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."
...@@ -11047,7 +11056,7 @@ print_version() ...@@ -11047,7 +11056,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.22.0 EPMVERSION=3.22.1
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
...@@ -2262,7 +2262,7 @@ print_version() ...@@ -2262,7 +2262,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.22.0 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.22.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