Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
eepm
Commits
9e3c730f
Commit
9e3c730f
authored
3 years ago
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
egrep -> grep -E
parent
a6e078ae
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
epm-addrepo
bin/epm-addrepo
+1
-1
epm-release_upgrade
bin/epm-release_upgrade
+1
-1
epm-restore
bin/epm-restore
+1
-1
epm-search
bin/epm-search
+3
-3
epm-sh-functions
bin/epm-sh-functions
+3
-3
epm-simulate
bin/epm-simulate
+2
-2
No files found.
bin/epm-addrepo
View file @
9e3c730f
...
...
@@ -182,7 +182,7 @@ __epm_addrepo_deb()
esac
# if started from url, use heroistic
if
echo
"
$repo
"
|
egrep
-q
"^https?://"
;
then
if
echo
"
$repo
"
|
grep
-E
-q
"^https?://"
;
then
repo
=
"deb [arch=
$ad
]
$repo
"
fi
...
...
This diff is collapsed.
Click to expand it.
bin/epm-release_upgrade
View file @
9e3c730f
...
...
@@ -81,7 +81,7 @@ __detect_alt_release_by_repo()
{
local
BRD
=
$(
cat
/etc/apt/sources.list /etc/apt/sources.list.d/
*
.list
\
|
grep
-v
"^#"
\
|
egrep
"[tpc][5-9]
\.
?[0-9]?/branch/"
\
|
grep
-E
"[tpc][5-9]
\.
?[0-9]?/branch/"
\
|
sed
-e
"s|.*
\(
[tpc][5-9]
\.\?
[0-9]
\?\)
/branch.*|
\1
|g"
\
|
sort
-u
)
if
[
"
$(
__wcount
$BRD
)
"
=
"1"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
bin/epm-restore
View file @
9e3c730f
...
...
@@ -154,7 +154,7 @@ __epm_restore_pip()
if
[
-n
"
$dryrun
"
]
;
then
reqmacro
=
"%py3_use"
basename
"
$req_file
"
|
egrep
-q
"(dev|test|coverage)"
&&
reqmacro
=
"%py3_buildrequires"
basename
"
$req_file
"
|
grep
-E
-q
"(dev|test|coverage)"
&&
reqmacro
=
"%py3_buildrequires"
echo
__epm_restore_print_comment
"
$req_file
"
cat
$req_file
| __epm_restore_convert_to_rpm_notation |
sed
-e
"s|^|
$reqmacro
|"
...
...
This diff is collapsed.
Click to expand it.
bin/epm-search
View file @
9e3c730f
...
...
@@ -151,7 +151,7 @@ __epm_search_make_grep()
echon
" | sed -e
\"
s| .*||g
\"
"
fi
[
-n
"
$listN
"
]
&&
echon
" |
egrep
-i -v --
\"
$listN
\"
"
[
-n
"
$listN
"
]
&&
echon
" |
grep -E
-i -v --
\"
$listN
\"
"
# FIXME: The World has not idea how to do grep both string
# http://stackoverflow.com/questions/10110051/grep-with-two-strings-logical-and-in-regex?rq=1
...
...
@@ -160,7 +160,7 @@ __epm_search_make_grep()
if
[
"
$(
echo
"
$list
"
|
wc
-w
)
"
-gt
1
]
;
then
for
i
in
$list
;
do
# FIXME -n on MacOS?
echon
" |
egrep
-i --
\"
$i
\"
"
echon
" |
grep -E
-i --
\"
$i
\"
"
done
fi
...
...
@@ -178,7 +178,7 @@ __epm_search_make_grep()
# TODO: use some colorifer instead grep (check grep adove too)
if
[
-n
"
$list
"
]
;
then
echon
" |
egrep
-i
$EGREPCOLOR
--
\"
(
$COLO
)
\"
"
echon
" |
grep -E
-i
$EGREPCOLOR
--
\"
(
$COLO
)
\"
"
fi
}
...
...
This diff is collapsed.
Click to expand it.
bin/epm-sh-functions
View file @
9e3c730f
...
...
@@ -59,8 +59,8 @@ check_tty()
check_core_commands
#
egrep
from busybox may not --color
#
egrep
from MacOS print help to stderr
#
grep -E
from busybox may not --color
#
grep -E
from MacOS print help to stderr
if
grep
-E
--help
2>&1 |
grep
-q
--
"--color"
;
then
export
EGREPCOLOR
=
"--color"
fi
...
...
@@ -210,7 +210,7 @@ isnumber()
# copied from strings
# CHECKME: the same like estrlist has ?
# Note: used
egrep
! write '[0-9]+(first|two)', not '[0-9]\+...'
# Note: used
grep -E
! write '[0-9]+(first|two)', not '[0-9]\+...'
rhas
()
{
echo
"
$1
"
|
grep
-E
-q
--
"
$2
"
...
...
This diff is collapsed.
Click to expand it.
bin/epm-simulate
View file @
9e3c730f
...
...
@@ -125,8 +125,8 @@ EOF
# FIXME: we need strict search here (not find gst-plugins-base if search for gst-plugins
# TODO: use short?
# use verbose for get package status
#pkg_filenames="$pkg-[0-9]" verbose=--verbose __epm_search_internal |
egrep
"(installed|upgrade)" && continue
#pkg_filenames="$pkg" verbose=--verbose __epm_search_internal |
egrep
"(installed|upgrade)" && continue
#pkg_filenames="$pkg-[0-9]" verbose=--verbose __epm_search_internal |
grep -E
"(installed|upgrade)" && continue
#pkg_filenames="$pkg" verbose=--verbose __epm_search_internal |
grep -E
"(installed|upgrade)" && continue
(
pkg_filenames
=
"
$pkg
"
__epm_search_internal
)
|
grep
-q
"^
$pkg
-[0-9]"
&&
continue
res
=
1
info
"Package '
$pkg
' does not found in repository."
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment