From 6b5e808d5f828c43ddce1657803a8cd7c6dd6694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sun, 17 Dec 2017 18:22:20 +0000 Subject: vars/dist_tarballs.vars:pkgp_dist_tarball_dist(): fix & simplify dist tarball generation. --- vars/dist_tarballs.vars | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vars/dist_tarballs.vars b/vars/dist_tarballs.vars index e3a6a42e..a63bc0f2 100644 --- a/vars/dist_tarballs.vars +++ b/vars/dist_tarballs.vars @@ -4,15 +4,14 @@ pkgp_dist_tarball_dist() { TARBALL_FNAME="${DEFAULT_TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}"; - tar -cpf - $(find . -maxdepth 2 -mindepth 1 -type d \ - -not -path ./${PREFIX_BASENAME} \ + tar -cpf - $(find . -maxdepth 1 -mindepth 1 -type d \ -not -path ./minipix \ -not -path ./minipix_dist \ - -not -path ./tmp -not -path ./tmp/\*) \ + -not -path ./tmp | sort) \ midipix_shortcut.vbs midipix.sh README SHA256SUMS |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_FNAME}"; ex_rtl_log_msg info "Finished building binary distribution tarball."; - if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] && \ + if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] && \ gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then gpg --armor --passphrase-file /dev/null \ --local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_FNAME}"; -- cgit v1.2.3