remove remaining apt-repo using

bin/epm-addrepo

@@ -158,7 +158,6 @@ __epm_addrepo_altlinux_url()
 
 __epm_addrepo_altlinux_help()
 {
-    #sudocmd apt-repo $dryrun add branch
 message '
 
 epm repo add - add branch repo. Use follow params:
@@ -314,8 +313,6 @@ __epm_addrepo_altlinux()
             ;;
     esac
 
-    assure_exists apt-repo
-
     if tasknumber "$repo" >/dev/null ; then
         #sudocmd_foreach "apt-repo $dryrun add" $(tasknumber "$repo")
         for i in $repo ; do

bin/epm-epm_install

@@ -82,7 +82,7 @@ __epm_korinf_install_eepm()
         [ -n "$interactive" ] || non_interactive="--auto"
     fi
 
-    # as now, can't install one package from task (and old apt-repo can't install one package)
+    # as now, can't install one package from task
     if false && [ "$BASEDISTRNAME" = "alt" ] && [ -z "$direct" ] ; then
         local task="$(docmd eget -O- https://eepm.ru/vendor/alt/task)"
         if [ -n "$task" ] ; then

bin/epm-removerepo

@@ -45,7 +45,7 @@ __epm_removerepo_apt()
 __epm_grep_repo_list()
 {
     while [ -n "$1" ] ; do
-        epm --quiet repolist | grep -E "$1"
+        epm --quiet repo list | grep -E "$1"
         shift
     done
 }
@@ -71,8 +71,6 @@ __epm_removerepo_alt()
     local repo="$*"
     [ -n "$repo" ] || fatal "No such repo or task. Use epm repo remove <regexp|autoimports|archive|tasks|TASKNUMBER>"
 
-    assure_exists apt-repo
-
     if tasknumber "$repo" >/dev/null ; then
         local tn
         for tn in $(tasknumber "$repo") ; do
@@ -88,8 +86,8 @@ __epm_removerepo_alt()
             info "remove autoimports repo"
             [ -n "$DISTRVERSION" ] || fatal "Empty DISTRVERSION"
             repo="autoimports.$branch"
-            sudocmd apt-repo $dryrun rm "$repo"
-            ;;
+            __epm_removerepo_alt_grepremove "$repo/"
+             ;;
         archive)
             info "remove archive repos"
             __epm_removerepo_alt_grepremove "archive/"
@@ -114,8 +112,6 @@ __epm_removerepo_alt()
             fatal "epm removerepo: no options are supported"
             ;;
         *)
-# TODO: if return empty for whole line, use grep
-#            sudocmd apt-repo $dryrun rm "$*"
             __epm_removerepo_alt_grepremove "$*"
             ;;
     esac

bin/epm-repofix

@@ -66,14 +66,12 @@ __repofix_filter_vendor()
 __replace_alt_version_in_repo()
 {
     local i
-    assure_exists apt-repo
     #echo "Upgrading $DISTRNAME from $1 to $2 ..."
-    a='' apt-repo list | sed -E -e "s|($1)|{\1}->{$2}|g" | grep -E --color -- "$1"
+    epm --quiet repo list | sed -E -e "s|($1)|{\1}->{$2}|g" | grep -E --color -- "$1"
     # ask and replace only we will have changes
-    if a='' apt-repo list | grep -E -q -- "$1" ; then
+    if epm --quiet repo list | grep -E -q -- "$1" ; then
         __replace_text_in_alt_repo "/^ *#/! s!$1!$2!g"
     fi
-    #docmd apt-repo list
 }
 
 __alt_replace_sign_name()
@@ -198,7 +196,7 @@ __change_repo()
     local SHORT="$1"
     local REPLTO="$2"
     local NN
-    a="" apt-repo list | grep -v $SHORT | grep -v "file:/" | while read nn ; do
+    epm --quiet repo list | grep -v $SHORT | grep -v "file:/" | while read nn ; do
         NN="$(__subst_with_repo_url "$nn" "$REPLTO")"
         [ "$NN" = "$nn" ] && continue
         epm addrepo "$NN" && epm removerepo "$nn" || return 1
@@ -251,14 +249,13 @@ epm_repofix()
 
 case $BASEDISTRNAME in
     "alt")
-        assure_exists apt-repo
-        [ -n "$quiet" ] || docmd apt-repo list
+        [ -n "$quiet" ] || docmd epm repo list
         assure_root
 
         __fix_alt_sources_list /etc/apt/sources.list
         __fix_alt_sources_list /etc/apt/sources.list.d/*.list
 
-        [ -n "$quiet" ] || docmd apt-repo list
+        [ -n "$quiet" ] || docmd epm repo list
         return
         ;;
 esac

bin/epm-sh-altlinux

@@ -57,7 +57,7 @@ get_task_arepo_packages_list()
     echo "$res" | cut -f1
 }
 
-# use assure apt-repo before
+
 get_task_packages()
 {
     local tn

eepm.spec

@@ -24,10 +24,6 @@ Provides: epm = %EVR
 
 # FIXHERE: Replace with target platform package manager
 Requires: apt rpm
-# apt-scripts missed on ALT SP 8, update-kernel is extra in containers
-#Requires: apt-scripts update-kernel
-# TODO: don't use at all
-Requires: apt-repo
 
 %endif