[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-sgml-dtd/

Michał Górny Tue, 17 Sep 2019 00:12:34 -0700

commit:     299042fc29cbb1cb9dbbcea2c5518761fd3819cb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 07:07:31 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 07:11:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299042fc


app-text/docbook-sgml-dtd: Restore .cat backup for non-empty too

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild | 6 ++++--
 app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild | 6 ++++--
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index d72a8256809..1787a5d05c8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index d72a8256809..1787a5d05c8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index d72a8256809..1787a5d05c8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index d72a8256809..1787a5d05c8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index 868d3429aec..118ee206846 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index 65e94280b8f..bef0181183d 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index 8e65feba19d..fd2c41e6679 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild 
b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index f72a63fe757..9e8d322d952 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -37,8 +37,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
-               cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+       local backup=${T}/sgml-docbook-${PV}.cat
+       local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+       if ! cmp -s "${backup}" "${real}"; then
+               cp "${backup}" "${real}" || die
        fi
        sgml-catalog-r1_pkg_postinst
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/docbook-sgml-dtd/

Reply via email to