epm-repo: fixes and improvements

bin/epm-addrepo

@@ -217,7 +217,7 @@ __epm_addrepo_apt()
 {
     local repo="$*"
 
-    epm repo list --quiet 2>/dev/null | grep -q -F "$repo" && return 0
+    epm --quiet repo list | grep -q -F "$repo" && return 0
 
     if [ -n "$dryrun" ] ; then
         echo "$repo"
@@ -428,7 +428,7 @@ __epm_addrepo_alpine()
 {
     local repo="$1"
     is_url "$repo" || fatal "Only URL is supported"
-    epm repo list --quiet | grep -q -F "$repo" && return 0
+    epm --quiet repo list | grep -q -F "$repo" && return 0
 
     echo "$repo" | sudocmd tee -a /etc/apk/repositories
 }

bin/epm-removerepo

@@ -38,8 +38,8 @@ __epm_removerepo_apt()
     for i in /etc/apt/sources.list /etc/apt/sources.list.d/*.list ; do
         [ -s "$i" ] || continue
         # touch file only when it is needed
-        grep -q -E "$repo" $i || continue
-        $sc sed -i -e "s|.*$repo.*||" $i
+        grep -q -F "$repo" $i || continue
+        $sc sed -i -e "s|.*$(sed_escape "$repo").*||" $i
     done
 }
 
@@ -47,7 +47,7 @@ __epm_removerepo_apt()
 __epm_grep_repo_list()
 {
     while [ -n "$1" ] ; do
-        epm --quiet repo list | grep -E "$1"
+        epm --quiet repo list "$1"
         shift
     done
 }
@@ -55,17 +55,17 @@ __epm_grep_repo_list()
 # remove grepped lines
 __epm_removerepo_alt_grepremove()
 {
-    local rl="$1"
+    local rl="$*"
 
     if [ "$rl" = "all" ] ; then
-        rl=".*"
+        rl="*"
     fi
 
     # ^rpm means full string
-    if !rhas "$1" "^rpm" ; then
-        rl="$(__epm_grep_repo_list "$@" 2>/dev/null)"
+    if ! rhas "$rl" "^rpm" ; then
+        rl="$(__epm_grep_repo_list "$rl" 2>/dev/null)"
         if [ -z "$rl" ] ; then
-            [ -n "$verbose" ] && warning 'Can'\''t find '$*' in the repos (see # epm repolist output)'
+            [ -n "$verbose" ] && warning 'Can'\''t find '$rl' in the repos (see # epm repolist output)'
             return 1
         fi
     fi
@@ -124,7 +124,7 @@ __epm_removerepo_alt()
             if echo "$*" | grep -q "^rpm" ; then
                 __epm_removerepo_apt "$*"
             else
-                info "removing source.list entries by mask '$*'"
+                info "removing all source.list"
                 __epm_removerepo_alt_grepremove "$*"
             fi
             ;;

bin/epm-repodisable

@@ -32,6 +32,7 @@ __epm_repodisable_alt()
     else
         rl="$( (epm --quiet repolist) 2>/dev/null | grep -F "$1" | head -n1 )"
         [ -z "$rl" ] && warning 'Can'\''t find $1 entries in the repos (see # epm repolist output)' && return 1
+        [ -z "$rl" ] && warning "Can't find '" $1 "' entries in the repos (see # epm repolist output)" && return 1
     fi
     echo "$rl" | while read rp ; do
         [ -n "$dryrun" ] && message 'will comment $rp' && continue

bin/epm-repoenable

@@ -30,8 +30,9 @@ __epm_repoenable_alt()
     if rhas "$1" "\^rpm" ; then
         rl="$(echo "$1" | sed -e 's|\^||')"
     else
-        rl="$( epm --quiet --all repolist 2>/dev/null | grep -F "$1" | head -n1 | sed -e 's|[[:space:]]*#[[:space:]]*||' )"
+        rl="$( epm --quiet repolist --all 2>/dev/null | grep -F "$1" | head -n1 | sed -e 's|[[:space:]]*#[[:space:]]*||' )"
         [ -z "$rl" ] && warning 'Can'\''t find commented $1 in the repos (see # epm repolist output)' && return 1
+        [ -z "$rl" ] && warning "Can't find commented '"$1"' in the repos (see # epm repolist output)" && return 1
     fi
     echo "$rl" | while read rp ; do
         [ -n "$dryrun" ] && message 'will uncomment $rp' && continue

bin/epm-repofix

@@ -69,7 +69,7 @@ __replace_alt_version_in_repo()
     #echo "Upgrading $DISTRNAME from $1 to $2 ..."
     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 epm --quiet repo list | grep -E -q -- "$1" ; then
+    if epm --quiet repo list "$1" ; then
         __replace_text_in_alt_repo "/^ *#/! s!$1!$2!g"
     fi
 }

bin/epm-repolist

@@ -91,6 +91,8 @@ print_apt_sources_list()
 {
     local LISTS='/etc/apt/sources.list /etc/apt/sources.list.d/*.list'
 
+    [ -n "$1" ] && echo "$*" | grep -q "\.[*?]" && warning "Only glob symbols * and ? are supported. Don't use regexp here!"
+
     if [ "$1" = "-a" ] || [ "$1" = "--all" ] ; then
         shift
         local wc=$(__convert_glob__to_regexp "$*")