gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

mail-mta/courier: use simpler bash expression

Browse Source 
The previous version was very difficult for bash parsers (like
tree-sitter) to parse correctly.

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Arthur Zamarin
2023-08-30 08:53:43 +03:00
committed by Sam James
parent 451f421407
commit 5920ebad5b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mail-mta/courier/courier-1.1.5-r3.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -112,7 +112,7 @@ src_compile() {
etc_courier() {
# Import existing /etc/courier/file if it exists.
# Add option only if it was not already set or even commented out
file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
local file="${1}" word=$(echo "${2}" | sed -e "s|=.*$||" -e "s|^.*opt ||")
[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
grep -q "${word}" "${D}/etc/courier/${file}" || \
@@ -120,7 +120,7 @@ etc_courier() {
}
etc_courier_chg() {
file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
local file="${1}" key="${2}" value="${3}" section="${4}"
[ -z "${section}" ] && section="${2}"
grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}

4
mail-mta/courier/courier-1.2.3-r1.ebuild
View File

@@ -107,7 +107,7 @@ src_compile() {
etc_courier() {
# Import existing /etc/courier/file if it exists.
# Add option only if it was not already set or even commented out
file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
local file="${1}" word=$(echo "${2}" | sed -e "s|=.*$||" -e "s|^.*opt ||")
[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
grep -q "${word}" "${D}/etc/courier/${file}" || \
@@ -115,7 +115,7 @@ etc_courier() {
}
etc_courier_chg() {
file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
local file="${1}" key="${2}" value="${3}" section="${4}"
[ -z "${section}" ] && section="${2}"
grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}

4
mail-mta/courier/courier-1.3.3.ebuild
View File

@@ -107,7 +107,7 @@ src_compile() {
etc_courier() {
# Import existing /etc/courier/file if it exists.
# Add option only if it was not already set or even commented out
file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
local file="${1}" word=$(echo "${2}" | sed -e "s|=.*$||" -e "s|^.*opt ||")
[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
grep -q "${word}" "${D}/etc/courier/${file}" || \
@@ -115,7 +115,7 @@ etc_courier() {
}
etc_courier_chg() {
file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
local file="${1}" key="${2}" value="${3}" section="${4}"
[ -z "${section}" ] && section="${2}"
grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}