| 1 |
commit: 049b80cd6b4ffe3929fd95a9f9b21582fd2373f4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 15 05:47:58 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 15 05:48:10 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=049b80cd |
| 7 |
|
| 8 |
euse: egrep -> grep -E |
| 9 |
|
| 10 |
egrep is considered an obsolete alias and newer greps will warn on this. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
bin/euse | 26 +++++++++++++------------- |
| 15 |
1 file changed, 13 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/bin/euse b/bin/euse |
| 18 |
index c3b6638..daffd66 100755 |
| 19 |
--- a/bin/euse |
| 20 |
+++ b/bin/euse |
| 21 |
@@ -338,11 +338,11 @@ get_useflaglist() { |
| 22 |
descdir="${profiledir}/profiles" |
| 23 |
if [[ -z ${SCOPE} || ${SCOPE} == "global" ]]; then |
| 24 |
[[ ! -s "${descdir}/use.desc" ]] && continue |
| 25 |
- egrep "^[^# ]+ +-" "${descdir}/use.desc" |
| 26 |
+ grep -E "^[^# ]+ +-" "${descdir}/use.desc" |
| 27 |
fi |
| 28 |
if [[ -z ${SCOPE} || ${SCOPE} == "local" ]]; then |
| 29 |
[[ ! -s "${descdir}/use.local.desc" ]] && continue |
| 30 |
- egrep "^[^# :]+:[^ ]+ +-" "${descdir}/use.local.desc" \ |
| 31 |
+ grep -E "^[^# :]+:[^ ]+ +-" "${descdir}/use.local.desc" \ |
| 32 |
| cut -d: -f 2 |
| 33 |
fi |
| 34 |
done | cut -d " " -f1 | sort --field=":" --key=1,1 --unique |
| 35 |
@@ -370,7 +370,7 @@ get_useflaglist() { |
| 36 |
# ACTIVE_FLAGS - Array of current use flag info |
| 37 |
# |
| 38 |
get_useflaglist_ebuild() { |
| 39 |
- local known=$(echo "${ACTIVE_FLAGS[5]}" | egrep "^${1}") |
| 40 |
+ local known=$(echo "${ACTIVE_FLAGS[5]}" | grep -E "^${1}") |
| 41 |
local cacheformat |
| 42 |
if [[ -n $known ]]; then |
| 43 |
# No need to recache |
| 44 |
@@ -397,7 +397,7 @@ get_useflaglist_ebuild() { |
| 45 |
return 1 |
| 46 |
fi |
| 47 |
append=$(set +f; ls ${portdir}/metadata/${cacheformat}/${1}-* \ |
| 48 |
- | egrep "${1}-[0-9.]+" \ |
| 49 |
+ | grep -E "${1}-[0-9.]+" \ |
| 50 |
| sed -e "s:${portdir}/metadata/${cacheformat}/${1}-::g" \ |
| 51 |
| while read -d $'\n' version; do |
| 52 |
IFS=$'\n' |
| 53 |
@@ -454,7 +454,7 @@ traverse_profile() { |
| 54 |
curdir="${2:-$(get_real_path ${MAKE_PROFILE_PATH})}" |
| 55 |
|
| 56 |
if [[ -f "${curdir}/parent" ]]; then |
| 57 |
- for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do |
| 58 |
+ for parent in $(grep -E -v '(^#|^ *$)' ${curdir}/parent); do |
| 59 |
# Bug 231394, handle parent path being absolute |
| 60 |
index=$(expr index "${parent}" :) |
| 61 |
if [[ ${parent:0:1} == "/" ]]; then |
| 62 |
@@ -906,9 +906,9 @@ showflags() { |
| 63 |
get_flagstatus ${1} |
| 64 |
echo |
| 65 |
fi |
| 66 |
- if echo " ${ACTIVE_FLAGS[4]} " | egrep -e " -?${1} " > /dev/null; then |
| 67 |
+ if echo " ${ACTIVE_FLAGS[4]} " | grep -E -e " -?${1} " > /dev/null; then |
| 68 |
for pkg in $( echo "${ACTIVE_FLAGS[4]}" | \ |
| 69 |
- egrep " -?${1} " | cut -d " " -f 2); do |
| 70 |
+ grep -E " -?${1} " | cut -d " " -f 2); do |
| 71 |
printf "%-20s" ${1} |
| 72 |
SCOPE="local" get_flagstatus ${1} "${pkg}" |
| 73 |
printf "(%s)\n" ${pkg} |
| 74 |
@@ -992,7 +992,7 @@ scrub_use_flag() { |
| 75 |
# If line only has this use flag, let it be removed |
| 76 |
# (used if PACKAGE is not defined -- from pruning) |
| 77 |
elif [[ -n $(echo "${line}" | \ |
| 78 |
- egrep "^[^#]*${atom_re}.*-?${flag}") ]]; then |
| 79 |
+ grep -E "^[^#]*${atom_re}.*-?${flag}") ]]; then |
| 80 |
echo "Removing use flag from ${line}" >&2 |
| 81 |
if [[ -z $(echo "${line}" | \ |
| 82 |
grep -Ee "${atom_re} *-?${flag} *$") ]]; then |
| 83 |
@@ -1068,10 +1068,10 @@ modify_package() { |
| 84 |
# XXX: Handle version or version wildcard? |
| 85 |
warn "USE flag \"${flag}\" is not used by $PACKAGE" |
| 86 |
# Don't necessarily bail for this, just warn |
| 87 |
- elif [[ -n "${V}" && -z "$(egrep "<|>|=" <<< "${PACKAGE:0:1}")" ]]; then |
| 88 |
+ elif [[ -n "${V}" && -z "$(grep -E "<|>|=" <<< "${PACKAGE:0:1}")" ]]; then |
| 89 |
error "Invalid package atom. Did you forget the leading '='?" |
| 90 |
continue |
| 91 |
- elif [[ -z "${V}" && -n "$(egrep "<|>|=" <<< "${PACKAGE:0:1}")" ]]; then |
| 92 |
+ elif [[ -z "${V}" && -n "$(grep -E "<|>|=" <<< "${PACKAGE:0:1}")" ]]; then |
| 93 |
error "Invalid package atom. Did you forget the version?" |
| 94 |
continue |
| 95 |
fi |
| 96 |
@@ -1114,7 +1114,7 @@ modify_package() { |
| 97 |
echo "Adding \"${PACKAGE}[${flag}]\" use flag in \"${filename}\"" |
| 98 |
local added=0 |
| 99 |
while read line; do |
| 100 |
- if [[ -n $(echo "${line}" | egrep -e "^[^#]*${PACKAGE} ") ]]; then |
| 101 |
+ if [[ -n $(echo "${line}" | grep -E -e "^[^#]*${PACKAGE} ") ]]; then |
| 102 |
echo $(reduce_package_use "${line} ${flag}") |
| 103 |
added=1 |
| 104 |
else |
| 105 |
@@ -1131,7 +1131,7 @@ modify_package() { |
| 106 |
local filename |
| 107 |
if [[ -d ${PACKAGE_USE_PATH} ]]; then |
| 108 |
# Scan for file containing named package and use flag |
| 109 |
- filename=$(egrep -rle "${pkg_re}.*[^-]${flag}( |$)" "${PACKAGE_USE_PATH}") |
| 110 |
+ filename=$(grep -E -rle "${pkg_re}.*[^-]${flag}( |$)" "${PACKAGE_USE_PATH}") |
| 111 |
if [[ -z "${filename}" ]]; then |
| 112 |
error ""${flag}" is not defined for package "${PACKAGE}"" |
| 113 |
continue |
| 114 |
@@ -1251,7 +1251,7 @@ modify() { |
| 115 |
# as the ending quote |
| 116 |
if [ "${line:0:4}" == "USE=" ]; then inuse=1; line=${line:5}; fi |
| 117 |
[ "${inuse}" == "0" ] && echo -E "${line}" |
| 118 |
- if [ "${inuse}" == "1" ] && echo "${line}" | egrep '" *(#.*)?$' > /dev/null; then |
| 119 |
+ if [ "${inuse}" == "1" ] && echo "${line}" | grep -E '" *(#.*)?$' > /dev/null; then |
| 120 |
echo -n 'USE="' |
| 121 |
echo -ne "${NEW_MAKE_CONF_USE_2%% }" |
| 122 |
echo '"' |
Archives