rewrite removerepo

bin/epm-removerepo

 #!/bin/sh
 #
-# Copyright (C) 2012, 2017  Etersoft
-# Copyright (C) 2012, 2017  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012, 2017, 2020  Etersoft
+# Copyright (C) 2012, 2017, 2020  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,55 +19,63 @@
 
 load_helper epm-sh-altlinux
 
+# remove grepped lines
+__epm_removerepo_alt_grepremove()
+{
+	local rp
+	epm repolist | grep -E "$1" | while read rp ; do
+		sudocmd apt-repo rm "$rp"
+	done
+}
+
+__epm_removerepo_alt()
+{
+	local repo="$*"
+	[ -n "$repo" ] || fatal "No such repo or task. Use epm remove repo <autoimports|archive|tasks|TASKNUMBER>"
+
+	assure_exists apt-repo
+
+	if tasknumber "$repo" >/dev/null ; then
+		local tn
+		for tn in $(tasknumber "$repo") ; do
+			__epm_removerepo_alt_grepremove " repo/$tn/"
+		done
+		return
+	fi
+
+	case "$1" in
+		autoimports)
+			info "remove autoimports repo"
+			[ -n "$DISTRVERSION" ] || fatal "Empty DISTRVERSION"
+			repo="autoimports.$(echo "$DISTRVERSION" | tr "[:upper:]" "[:lower:]")"
+			sudocmd apt-repo rm "$repo"
+			;;
+		archive)
+			info "remove archive repos"
+			__epm_removerepo_alt_grepremove "archive/"
+			;;
+		tasks)
+			info "remove task repos"
+			__epm_removerepo_alt_grepremove " repo/[0-9]+/"
+			;;
+		task)
+			shift
+			__epm_removerepo_alt_grepremove " repo/$1/"
+			;;
+		*)
+			sudocmd apt-repo rm "$*"
+			;;
+	esac
+
+}
+
 epm_removerepo()
 {
 local repo="$(eval echo $quoted_args)"
 
 case $DISTRNAME in
 	ALTLinux)
-		assure_exists apt-repo
-		case "$repo" in
-			autoimports)
-				info "remove autoimports repo"
-				[ -n "$DISTRVERSION" ] || fatal "Empty DISTRVERSION"
-				repo="$repo.$(echo "$DISTRVERSION" | tr "[:upper:]" "[:lower:]")"
-				;;
-			archive)
-				info "remove archive repos"
-				assure_exists apt-repo
-				epm repolist | grep "archive/" | while read repo ; do
-					sudocmd apt-repo rm "$repo"
-				done
-				return 0
-				;;
-			tasks)
-				info "remove task repos"
-				assure_exists apt-repo
-				epm repolist | grep -E " repo/[0-9]+/" | while read repo ; do
-					sudocmd apt-repo rm "$repo"
-				done
-				return 0
-				;;
-			*)
-				if tasknumber "$repo" >/dev/null ; then
-					assure_exists apt-repo
-					local tn
-					for tn in $(tasknumber "$repo") ; do
-						repoline="$(epm repolist | grep " repo/$tn/" | line)" #"
-						[ -n "$repoline" ] || { info "Can't find $tn task in the repository list" ; continue ; }
-						sudocmd apt-repo rm "$repoline"
-						# try again to remove possible x86_64-i586
-						repoline="$(epm repolist | grep " repo/$tn/" | line)" #"
-						[ -n "$repoline" ] || continue
-						sudocmd apt-repo rm "$repoline"
-					done
-					return 0
-				fi
-				;;
-		esac
-
-		[ -n "$repo" ] || fatal "No such repo or task. Use epm remove repo <autoimports|archive|tasks|TASKNUMBER>"
-		sudocmd apt-repo rm "$repo"
+		__epm_removerepo_alt $repo
 		return
 		;;
 esac;