From 97a26084c0f2425e8099f591406f0d98950aa593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 9 Feb 2020 10:43:56 +0000 Subject: vars/invariants_minipix.vars: predicate copying files on existence thereof. --- vars/invariants_minipix.vars | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'vars') diff --git a/vars/invariants_minipix.vars b/vars/invariants_minipix.vars index f05e367d..2f00ec21 100644 --- a/vars/invariants_minipix.vars +++ b/vars/invariants_minipix.vars @@ -23,31 +23,36 @@ pkg_invariants_minipix_all() { fi; done; for _fname in clear reset tset; do - if pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin"; then + if [ -e "${PREFIX_NATIVE}/bin/${_fname}" ]\ + && pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin"; then ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin"; fi; done; - for _pname in $(find "${PREFIX}/minipix_dist/bin" \ + for _pname in $([ -e "${PREFIX}/minipix_dist/bin" ] && find "${PREFIX}/minipix_dist/bin" \ -maxdepth 1 -perm /a=x -type f -and \( -not -name "lib*" \)); do if pkgp_invariants_minipix_is_newer "${_pname}" "${PREFIX_MINIPIX}/bin"; then ex_rtl_fileop cp_follow "${_pname}" "${PREFIX_MINIPIX}/bin"; fi; done; - for _fname in libc.so libcrypto.so.45 libexpat.so.1 liblzma.so.5 libmagic.so.1 \ - libncurses.so.6 libncursesw.so.6 libpcre.so.1 libperk.so.0 \ - libpsxscl.so libpython2.7.so.1 libreadline.so.7 libssl.so.47 \ - libu16ports.so.0 libtinfo.so.6 libtinfow.so.6 libunistring.so.2 \ + for _fname in libc.so libcrypto.so.45 libexpat.so.1 liblzma.so.5 libmagic.so.1 \ + libncurses.so.6 libncursesw.so.6 libpcre.so.1 libperk.so.0 \ + libpsxscl.so libpython2.7.so.1 libreadline.so.7 libssl.so.47 \ + libu16ports.so.0 libtinfo.so.6 libtinfow.so.6 libunistring.so.2 \ libuuid.so.1; do - if pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin"; then - ex_rtl_fileop cp_follow \ + if [ -e "${PREFIX_NATIVE}/lib/${_fname}" ]\ + && pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin"; then + ex_rtl_fileop cp_follow \ "${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin"; fi; done; for _dname in lib/python2.7 share/gdb; do - tar -C "${PREFIX}/minipix_dist" -cpf - "${_dname}" | tar -C "${PREFIX_MINIPIX}" -xpf -; + if [ -d "${PREFIX}/minipix_dist/${_dname}" ]; then + tar -C "${PREFIX}/minipix_dist" -cpf - "${_dname}" | tar -C "${PREFIX_MINIPIX}" -xpf -; + fi; done; for _fname in nano vim; do - if pkgp_invariants_minipix_is_newer "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share"; then + if [ -e "${PREFIX}/minipix_dist/share/${_fname}" ]\ + && pkgp_invariants_minipix_is_newer "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share"; then ex_rtl_fileop cp_follow "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share"; fi; done; @@ -62,7 +67,8 @@ pkg_invariants_minipix_all() { if [ ! -e "${PREFIX_MINIPIX}/${_dname}" ]; then ex_rtl_fileop mkdir "${PREFIX_MINIPIX}/${_dname}"; fi; - if pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}"; then + if [ -e "${PREFIX_NATIVE}/${_dname}/${_fname}" ]\ + && pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}"; then ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}"; fi; done; -- cgit v1.2.3