Commit 5ee9f594 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm ei: improve messages

parent 31a6807b
...@@ -33,6 +33,7 @@ __epm_korinf_site_mask() { ...@@ -33,6 +33,7 @@ __epm_korinf_site_mask() {
local URL="$EPM_KORINF_REPO_URL/$archprefix$DISTRNAME/$DISTRVERSION" local URL="$EPM_KORINF_REPO_URL/$archprefix$DISTRNAME/$DISTRVERSION"
if ! eget --check-url "$URL" ; then if ! eget --check-url "$URL" ; then
tURL="$EPM_KORINF_REPO_URL/$archprefix$BASEDISTRNAME/$DISTRREPONAME" tURL="$EPM_KORINF_REPO_URL/$archprefix$BASEDISTRNAME/$DISTRREPONAME"
info "Can't access to $URL, trying get by base distro name ..."
docmd eget --check-url "$tURL" && URL="$tURL" docmd eget --check-url "$tURL" && URL="$tURL"
fi fi
eget --list --latest "$URL/$MASK*.$PKGFORMAT" eget --list --latest "$URL/$MASK*.$PKGFORMAT"
...@@ -64,6 +65,7 @@ __epm_korinf_install_eepm() ...@@ -64,6 +65,7 @@ __epm_korinf_install_eepm()
{ {
if [ "$BASEDISTRNAME" = "alt" ] && [ "$DISTRVERSION" != "Sisyphus" ] && [ "$EPMMODE" = "package" ] ; then if [ "$BASEDISTRNAME" = "alt" ] && [ "$DISTRVERSION" != "Sisyphus" ] && [ "$EPMMODE" = "package" ] ; then
info "Checking eepm package status ..."
if epm status --original eepm ; then if epm status --original eepm ; then
warning 'Using external (Korinf) repo is forbidden for stable ALT branch $DISTRVERSION.' warning 'Using external (Korinf) repo is forbidden for stable ALT branch $DISTRVERSION.'
info "Check https://bugzilla.altlinux.org/44314 for reasons." info "Check https://bugzilla.altlinux.org/44314 for reasons."
...@@ -82,11 +84,12 @@ __epm_korinf_install_eepm() ...@@ -82,11 +84,12 @@ __epm_korinf_install_eepm()
[ -n "$interactive" ] || non_interactive="--auto" [ -n "$interactive" ] || non_interactive="--auto"
fi fi
# TODO: installing via task
# as now, can't install one package from task # as now, can't install one package from task
if false && [ "$BASEDISTRNAME" = "alt" ] && [ -z "$direct" ] ; then if false && [ "$BASEDISTRNAME" = "alt" ] && [ -z "$direct" ] ; then
local task="$(docmd eget -O- https://eepm.ru/vendor/alt/task)" local task="$(docmd eget -O- https://eepm.ru/vendor/alt/task)"
if [ -n "$task" ] ; then if [ -n "$task" ] ; then
docmd epm install $task docmd epm install $task:eepm
return return
else else
info "Can't get actual task for ALT, fallback to Korinf" info "Can't get actual task for ALT, fallback to Korinf"
...@@ -94,7 +97,7 @@ __epm_korinf_install_eepm() ...@@ -94,7 +97,7 @@ __epm_korinf_install_eepm()
fi fi
pkg_list="eepm" pkg_list="eepm"
# don't lose eepm-* if installed # preserve already installed eepm-*
for i in repack play ; do for i in repack play ; do
is_installed eepm-$i && pkg_list="$pkg_list eepm-$i" is_installed eepm-$i && pkg_list="$pkg_list eepm-$i"
done done
...@@ -114,8 +117,8 @@ Default Korinf repository: $EPM_KORINF_REPO_URL ...@@ -114,8 +117,8 @@ Default Korinf repository: $EPM_KORINF_REPO_URL
Examples: Examples:
epm ei [epm|eepm] - install latest eepm (default action) epm ei [epm|eepm] - install latest eepm (default action)
epm ei <package1> [<package2>...] - install package(s) from default Korinf repo epm ei <package1> [<package2>...] - install package(s) from default Korinf repo
epm http://someurl.ru <package> - install package(s) from a repo defined by URL epm ei http://someurl.ru <package>- install package(s) from a repo defined by URL
epm --list <package mask> - list available packages by mask epm ei --list <package mask> - list available packages by mask
' '
} }
......
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