[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/

[Sam James]

commit:     1925c2fe931db9c7b05e222170cf57c96e398dbc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 07:28:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 07:35:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1925c2fe

dev-ml/findlib: cleanup check_stublibs

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-ml/findlib/findlib-1.9.5.ebuild | 14 ++++++--------
 dev-ml/findlib/findlib-1.9.6.ebuild | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/dev-ml/findlib/findlib-1.9.5.ebuild 
b/dev-ml/findlib/findlib-1.9.5.ebuild
index 701736ea9f4a..47f06adbaf23 100644
--- a/dev-ml/findlib/findlib-1.9.5.ebuild
+++ b/dev-ml/findlib/findlib-1.9.5.ebuild
@@ -58,18 +58,16 @@ src_install() {
 }
 
 check_stublibs() {
-       local ocaml_stdlib=`ocamlc -where`
+       local ocaml_stdlib=$(ocamlc -where)
        local ldconf="${ocaml_stdlib}/ld.conf"
 
-       if [ ! -e ${ldconf} ]
-       then
-               echo "${ocaml_stdlib}" > ${ldconf}
-               echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+       if [[ ! -e ${ldconf} ]] ; then
+               echo "${ocaml_stdlib}" > ${ldconf} || die
+               echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
        fi
 
-       if [ -z `grep -e ${stublibs} ${ldconf}` ]
-       then
-               echo ${stublibs} >> ${ldconf}
+       if ! grep -qe ${stublibs} ${ldconf} ; then
+               echo ${stublibs} >> ${ldconf} || die
        fi
 }
 

diff --git a/dev-ml/findlib/findlib-1.9.6.ebuild 
b/dev-ml/findlib/findlib-1.9.6.ebuild
index b2e309f4791b..235bfbea3c71 100644
--- a/dev-ml/findlib/findlib-1.9.6.ebuild
+++ b/dev-ml/findlib/findlib-1.9.6.ebuild
@@ -58,18 +58,16 @@ src_install() {
 }
 
 check_stublibs() {
-       local ocaml_stdlib=`ocamlc -where`
+       local ocaml_stdlib=$(ocamlc -where)
        local ldconf="${ocaml_stdlib}/ld.conf"
 
-       if [ ! -e ${ldconf} ]
-       then
-               echo "${ocaml_stdlib}" > ${ldconf}
-               echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+       if [[ ! -e ${ldconf} ]] ; then
+               echo "${ocaml_stdlib}" > ${ldconf} || die
+               echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
        fi
 
-       if [ -z `grep -e ${stublibs} ${ldconf}` ]
-       then
-               echo ${stublibs} >> ${ldconf}
+       if ! grep -qe ${stublibs} ${ldconf} ; then
+               echo ${stublibs} >> ${ldconf} || die
        fi
 }