Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
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
Ximper Linux
mkimage-profiles
Commits
ee111341
Commit
ee111341
authored
May 12, 2022
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace 'egrep' to 'grep -E'
Fix 'warning: egrep is obsolescent; using grep -E'
parent
ccc6861d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
mktmpdir
bin/mktmpdir
+1
-1
tags2lists
bin/tags2lists
+1
-1
85-cleanup-lowmem
...ures.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem
+2
-2
10-services
features.in/services/install2/image-scripts.d/10-services
+1
-1
40-x11-autologin
....in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin
+1
-1
build.mk
lib/build.mk
+1
-1
profile.mk
lib/profile.mk
+1
-1
No files found.
bin/mktmpdir
View file @
ee111341
...
@@ -44,7 +44,7 @@ contemplate_dirs()
...
@@ -44,7 +44,7 @@ contemplate_dirs()
# hasher emits no meaningful errors regarding those, sigh
# hasher emits no meaningful errors regarding those, sigh
check_options
()
check_options
()
{
{
!
egrep
-q
"^
$1
$2
.*no(dev|exec)"
/proc/mounts
!
grep
-E
-q
"^
$1
$2
.*no(dev|exec)"
/proc/mounts
}
}
# pick existing, writeable, >256M free space dirs
# pick existing, writeable, >256M free space dirs
...
...
bin/tags2lists
View file @
ee111341
...
@@ -33,4 +33,4 @@ transformed="$(sed \
...
@@ -33,4 +33,4 @@ transformed="$(sed \
[
-z
"
$transformed
"
]
||
[
-z
"
$transformed
"
]
||
find
$transformed
\
find
$transformed
\
|
sed
's,^\./,,'
\
|
sed
's,^\./,,'
\
|
egrep
-v
'(\.sw.|~)$'
|
grep
-E
-v
'(\.sw.|~)$'
features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem
View file @
ee111341
...
@@ -19,7 +19,7 @@ cd /usr/share/X11/locale &&
...
@@ -19,7 +19,7 @@ cd /usr/share/X11/locale &&
# xkb; don't drop "pc" yet
# xkb; don't drop "pc" yet
cd
/usr/share/X11/xkb/symbols
&&
cd
/usr/share/X11/xkb/symbols
&&
ls
\
ls
\
|
egrep
-v
'by|en|kz|pt|ru|ua|us|pc|....*'
\
|
grep
-E
-v
'by|en|kz|pt|ru|ua|us|pc|....*'
\
| xargs
rm
-rf
--
| xargs
rm
-rf
--
# gconv
# gconv
...
@@ -30,7 +30,7 @@ cd /usr/lib*/gconv &&
...
@@ -30,7 +30,7 @@ cd /usr/lib*/gconv &&
for
dir
in
/usr/
{
lib
*
,share
}
/locale
;
do
for
dir
in
/usr/
{
lib
*
,share
}
/locale
;
do
cd
"
$dir
"
&&
\
cd
"
$dir
"
&&
\
ls
\
ls
\
|
egrep
-v
'^be|en|kk|pt|ru|uk'
\
|
grep
-E
-v
'^be|en|kk|pt|ru|uk'
\
| xargs
rm
-rf
--
;
| xargs
rm
-rf
--
;
done
done
...
...
features.in/services/install2/image-scripts.d/10-services
View file @
ee111341
...
@@ -19,7 +19,7 @@ switch() {
...
@@ -19,7 +19,7 @@ switch() {
sname
=
"
${
sname
%.socket
}
"
sname
=
"
${
sname
%.socket
}
"
[
-n
"
$CHECK_FILES
"
]
&&
\
[
-n
"
$CHECK_FILES
"
]
&&
\
egrep
-qs
"^[[:blank:]]*
$sname
(.service|.socket)?[[:blank:]]*$"
\
grep
-E
-qs
"^[[:blank:]]*
$sname
(.service|.socket)?[[:blank:]]*$"
\
$CHECK_FILES
&&
return
||
:
$CHECK_FILES
&&
return
||
:
# avoid service duplication: drop sevice without unit type
# avoid service duplication: drop sevice without unit type
...
...
features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin
View file @
ee111341
...
@@ -11,7 +11,7 @@ USER=altlinux
...
@@ -11,7 +11,7 @@ USER=altlinux
add_nopasswdlogin_group
()
add_nopasswdlogin_group
()
{
{
[
-f
"/etc/pam.d/
$1
"
]
&&
[
-f
"/etc/pam.d/
$1
"
]
&&
egrep
-qs
'^auth.+user[[:blank:]]+ingroup[[:blank:]]+nopasswdlogin'
"/etc/pam.d/
$1
"
&&
grep
-E
-qs
'^auth.+user[[:blank:]]+ingroup[[:blank:]]+nopasswdlogin'
"/etc/pam.d/
$1
"
&&
groupadd
-r
nopasswdlogin
&&
groupadd
-r
nopasswdlogin
&&
gpasswd
-a
"
$USER
"
nopasswdlogin
gpasswd
-a
"
$USER
"
nopasswdlogin
}
}
...
...
lib/build.mk
View file @
ee111341
...
@@ -115,7 +115,7 @@ build-image: profile/populate
...
@@ -115,7 +115,7 @@ build-image: profile/populate
fi; \
fi; \
tail -n $(MAX_LINES) "$(BUILDLOG)" \
tail -n $(MAX_LINES) "$(BUILDLOG)" \
| GREP_COLOR="$(ANSI_FAIL)" \
| GREP_COLOR="$(ANSI_FAIL)" \
egrep
--color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
grep -E
--color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
{ print "NB: low space on "$$6" ("$$5" used)"}}'; \
fi; \
fi; \
...
...
lib/profile.mk
View file @
ee111341
...
@@ -56,7 +56,7 @@ profile/init: distclean
...
@@ -56,7 +56,7 @@ profile/init: distclean
SOURCELIST Dir::Etc::sourcelist/f \
SOURCELIST Dir::Etc::sourcelist/f \
SOURCEPARTS Dir::Etc::sourceparts/d`; \
SOURCEPARTS Dir::Etc::sourceparts/d`; \
find "$$SOURCEPARTS" -mindepth 1 -maxdepth 1 -name '*.list' \
find "$$SOURCEPARTS" -mindepth 1 -maxdepth 1 -name '*.list' \
| xargs
egrep
-hv -e '^#|^[[:blank:]]*$$' -- "$$SOURCELIST" \
| xargs
grep -E
-hv -e '^#|^[[:blank:]]*$$' -- "$$SOURCELIST" \
| tee $(BUILDDIR)/sources.list; \
| tee $(BUILDDIR)/sources.list; \
echo; \
echo; \
} $(LOG); \
} $(LOG); \
...
...
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