diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-25 17:26:03 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-25 17:26:03 +0000 |
| commit | 2b85d0a1de9ec57aab6293163d9885d76a47035c (patch) | |
| tree | 1af88e8d048a80a938eeb2f2ef755afb1db0d367 /subr/pkg_install.subr | |
| parent | 3c8c5672d623aa069082cc9aad5af13fdd69a97a (diff) | |
| download | midipix_build-2b85d0a1de9ec57aab6293163d9885d76a47035c.tar.bz2 midipix_build-2b85d0a1de9ec57aab6293163d9885d76a47035c.tar.xz | |
General cleanup, pt. I.
Diffstat (limited to 'subr/pkg_install.subr')
| -rw-r--r-- | subr/pkg_install.subr | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr index b4f68754..46024e8e 100644 --- a/subr/pkg_install.subr +++ b/subr/pkg_install.subr @@ -1,30 +1,27 @@ # -# set -o errexit -o noglob are assumed. +# set +o errexit -o noglob is assumed. # pkg_install() { local _pkglist_name=""; - ex_rtl_fileop mkdir "${PKG_PREFIX}"; - find "${PKG_DESTDIR}" \ - -type d -exec chmod 0755 {} \;; - find "${PKG_DESTDIR}" \ - \( -not -perm /0111 \) \ - -type f -exec chmod 0644 {} \;; - find "${PKG_DESTDIR}" \ - -perm /0111 -type f -exec chmod 0755 {} \;; - tar -C "${PKG_DESTDIR}" -cpf - . |\ - tar -C "${PKG_PREFIX}" --overwrite -xpf -; - if ex_rtl_lmatch "${ARG_DIST}" , pkg; then - tar -C "${PKG_DESTDIR}" -cpf - . |\ - gzip -c -9 - > "${PKG_BASE_DIR}/${PKG_NAME}.tgz" - fi; - if [ "${PKG_PKGLIST_DISABLE:-0}" -eq 0 ]; then - if [ ! -e "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" ]; then - touch "${PREFIX}/pkglist.${PKG_BUILD_TYPE}"; + if ! ex_rtl_fileop mkdir "${PKG_PREFIX}"\ + || ! find "${PKG_DESTDIR}" -type d -exec chmod 0755 {} \;\ + || ! find "${PKG_DESTDIR}" \( -not -perm /0111 \) -type f -exec chmod 0644 {} \;\ + || ! find "${PKG_DESTDIR}" -perm /0111 -type f -exec chmod 0755 {} \;\ + || ! tar -C "${PKG_DESTDIR}" -cpf - . | tar -C "${PKG_PREFIX}" --overwrite -xpf -; then + return "${?}"; + else + if ex_rtl_lmatch "${ARG_DIST}" "pkg" ","; then + tar -C "${PKG_DESTDIR}" -cpf - . |\ + gzip -c -9 - > "${PKG_BASE_DIR}/${PKG_NAME}.tgz" || return "${?}"; + fi; + if [ "${PKG_PKGLIST_DISABLE:-0}" -eq 0 ]; then + if [ ! -e "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" ]; then + touch "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" || return "${?}"; + fi; + _pkglist_name="${PKG_BASE_DIR##*/}"; _pkglist_name="${_pkglist_name%%-*}"; + echo "${_pkglist_name}" >> "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" || return "${?}"; fi; - _pkglist_name="${PKG_BASE_DIR##*/}"; - _pkglist_name="${_pkglist_name%%-*}"; - echo "${_pkglist_name}" >> "${PREFIX}/pkglist.${PKG_BUILD_TYPE}"; fi; }; |