Collapse commands with grep piped to sed into one sed command.
This commit is contained in:
parent
908390511e
commit
7dca64fa48
|
@ -1,3 +1,4 @@
|
||||||
|
- Collapse commands with grep piped to sed into one sed command.
|
||||||
- Fix type_change bug in term_user_pty().
|
- Fix type_change bug in term_user_pty().
|
||||||
- Move ice_tmp_t from miscfiles to xserver.
|
- Move ice_tmp_t from miscfiles to xserver.
|
||||||
- Login fixes from Serge Hallyn.
|
- Login fixes from Serge Hallyn.
|
||||||
|
|
|
@ -250,9 +250,8 @@ $(USERPATH)/system.users: $(M4SUPPORT) tmp/generated_definitions.conf $(USER_FIL
|
||||||
@echo "# This file is replaced on reinstalls of this policy." >> tmp/system.users
|
@echo "# This file is replaced on reinstalls of this policy." >> tmp/system.users
|
||||||
@echo "# Please edit local.users to make local changes." >> tmp/system.users
|
@echo "# Please edit local.users to make local changes." >> tmp/system.users
|
||||||
@echo "#" >> tmp/system.users
|
@echo "#" >> tmp/system.users
|
||||||
$(QUIET) m4 -D self_contained_policy $(M4PARAM) $^ | \
|
$(QUIET) m4 -D self_contained_policy $(M4PARAM) $^ | sed -r -e 's/^[[:blank:]]+//' \
|
||||||
egrep -v "^[[:blank:]]*($$|#)" | \
|
-e '/^[[:blank:]]*($$|#)/d' >> tmp/system.users
|
||||||
sed -r -e 's/^[[:blank:]]+//' >> tmp/system.users
|
|
||||||
$(QUIET) install -m 644 tmp/system.users $@
|
$(QUIET) install -m 644 tmp/system.users $@
|
||||||
|
|
||||||
$(USERPATH)/local.users: config/local.users
|
$(USERPATH)/local.users: config/local.users
|
||||||
|
@ -268,8 +267,8 @@ install-appconfig: $(APPFILES)
|
||||||
|
|
||||||
$(INSTALLDIR)/booleans: $(BOOLEANS)
|
$(INSTALLDIR)/booleans: $(BOOLEANS)
|
||||||
@mkdir -p $(INSTALLDIR)
|
@mkdir -p $(INSTALLDIR)
|
||||||
$(QUIET) egrep '^[[:blank:]]*[[:alpha:]]' $(BOOLEANS) \
|
$(QUIET) sed -r -e 's/false/0/g' -e 's/true/1/g' \
|
||||||
| sed -e 's/false/0/g' -e 's/true/1/g' > tmp/booleans
|
-e '/^[[:blank:]]*($$|#)/d' $(BOOLEANS) | sort > tmp/booleans
|
||||||
$(QUIET) install -m 644 tmp/booleans $@
|
$(QUIET) install -m 644 tmp/booleans $@
|
||||||
|
|
||||||
$(CONTEXTPATH)/files/media: $(APPCONF)/media
|
$(CONTEXTPATH)/files/media: $(APPCONF)/media
|
||||||
|
|
Loading…
Reference in New Issue