Commit cef80e2e authored by Vitaly Lipatov's avatar Vitaly Lipatov

use grep with -- before params

parent 4935e56a
......@@ -46,6 +46,8 @@ case $PMTYPE in
[ -n "$PKGLIST" ] || break
sudocmd yum remove $PKGLIST
done
docmd rpm -Va --nofiles --nodigest
;;
urpm-rpm)
sudocmd urpme --auto-orphans
......
......@@ -26,9 +26,9 @@ _query_via_packages_list()
local res=0
local firstpkg=$1
shift
epm_packages | grep "$firstpkg-" || res=1
epm_packages | grep -- "$firstpkg-" || res=1
for pkg in "$@" ; do
epm_packages 2>/dev/null | grep "$pkg-" || res=1
epm_packages 2>/dev/null | grep -- "$pkg-" || res=1
done
return $res
}
......
......@@ -86,7 +86,7 @@ __do_query()
;;
slackpkg)
# note: need remove leading slash for grep
docmd grep -R "$(echo $@ | sed -e 's|^/\+||g')" /var/log/packages | sed -e "s|/var/log/packages/||g"
docmd grep -R -- "$(echo $@ | sed -e 's|^/\+||g')" /var/log/packages | sed -e "s|/var/log/packages/||g"
return
;;
*)
......
......@@ -22,5 +22,5 @@ load_helper epm-packages
epm_query_package()
{
#showcmd grep --color "$pkg_filenames"
pkg_filenames= epm_packages | grep --color "$pkg_filenames"
pkg_filenames= epm_packages | grep --color -- "$pkg_filenames"
}
......@@ -24,8 +24,8 @@ print_apt_sources_list()
test -r "$i" || continue
#echo
#echo "$i:"
grep -v "^#" $i
done | grep -v "^ *\$"
grep -v -- "^#" $i
done | grep -v -- "^ *\$"
}
epm_repolist()
......@@ -57,10 +57,10 @@ case $PMTYPE in
docmd layman -L
;;
pacman)
docmd grep -v "^#\|^$" /etc/pacman.conf
docmd grep -v -- "^#\|^$" /etc/pacman.conf
;;
slackpkg)
docmd grep -v "^#\|^$" /etc/slackpkg/mirrors
docmd grep -v -- "^#\|^$" /etc/slackpkg/mirrors
;;
*)
fatal "Do not known command for $PMTYPE"
......
......@@ -36,7 +36,7 @@ local_content_search()
{
[ -n "$USETTY" ] && echo "Search in $CI and $CINOA for $1..."
grep -h ".*$1.*\t" $CI $CINOA | sed -e "s|\(.*\)\t\(.*\)|\2: \1|g"
grep -h -- ".*$1.*\t" $CI $CINOA | sed -e "s|\(.*\)\t\(.*\)|\2: \1|g"
} | $OUTCMD
}
......
......@@ -161,7 +161,7 @@ set_sudo()
# print options description from HELPCMD/HELPOPT lines in the code
get_help()
{
grep "# $1" $0 | while read n ; do
grep -- "# $1" $0 | while read n ; do
opt=$(echo $n | sed -e "s|) # $1:.*||g")
desc=$(echo $n | sed -e "s|.*) # $1:||g")
printf " %-20s %s\n" $opt "$desc"
......
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