From 1debf7479879465ea4f480ce16329260b6e02ddc Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>
Date: Dec 03 2017 23:21:03 +0000
Subject: vars/dist_tarballs.vars: fix vars usage.


---

diff --git a/vars/dist_tarballs.vars b/vars/dist_tarballs.vars
index b035e78..eea37ab 100644
--- a/vars/dist_tarballs.vars
+++ b/vars/dist_tarballs.vars
@@ -10,12 +10,12 @@ pkgp_dist_tarball_dist() {
 			-not -path ./${PREFIX_BASENAME}.bak/\*				\
 			-not -path ./tmp -not -path ./tmp/\*)				\
 		midipix_shortcut.vbs midipix.sh	README SHA256SUMS			|\
-	"${DEFAULT_TARBALL_COMPRESS_CMD}" ${DEFAULT_TARBALL_COMPRESS_ARGS} -c > "${DEFAULT_TARBALL_FNAME}";
+	"${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}" ] &&		\
 				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 "${DEFAULT_TARBALL_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_FNAME}";
 		ex_rtl_log_msg info "Signed binary distribution tarball.";
 	fi;
 };
@@ -23,12 +23,12 @@ pkgp_dist_tarball_dist() {
 pkgp_dist_tarball_toolchain() {
 	TARBALL_CROSS_FNAME="${DEFAULT_TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}";
 	tar -cpf - bin include lib lib64 libexec share "${PKG_TARGET}"			|\
-	"${DEFAULT_TARBALL_COMPRESS_CMD}" ${DEFAULT_TARBALL_COMPRESS_ARGS} -c > "${DEFAULT_TARBALL_CROSS_FNAME}";
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_CROSS_FNAME}";
 	ex_rtl_log_msg info "Finished building toolchain tarball.";
 	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 "${DEFAULT_TARBALL_CROSS_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_CROSS_FNAME}";
 		ex_rtl_log_msg info "Signed toolchain tarball.";
 	fi;
 };
@@ -37,12 +37,12 @@ pkgp_dist_tarball_minipix() {
 	TARBALL_MINIPIX_FNAME="${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}";
 	tar -cpf - minipix 								\
 		midipix_shortcut.vbs midipix.sh README					|\
-	"${DEFAULT_TARBALL_COMPRESS_CMD}" ${DEFAULT_TARBALL_COMPRESS_ARGS} -c > "${DEFAULT_TARBALL_MINIPIX_FNAME}";
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_MINIPIX_FNAME}";
 	ex_rtl_log_msg info "Finished building binary Minipix distribution tarball.";
 	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 "${DEFAULT_TARBALL_MINIPIX_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_MINIPIX_FNAME}";
 		ex_rtl_log_msg info "Signed binary Minipix distribution tarball.";
 	fi;
 };
@@ -55,12 +55,12 @@ pkgp_dist_tarball_src() {
 		-not -path tmp/ntctty\*						\
 		-not -path tmp/psxscl\*						\
 		-not -path tmp/ptycon\*)					|\
-	"${DEFAULT_TARBALL_COMPRESS_CMD}" ${DEFAULT_TARBALL_COMPRESS_ARGS} -c > "${DEFAULT_TARBALL_SRC_FNAME}";
+	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_SRC_FNAME}";
 	ex_rtl_log_msg info "Finished building source tarball.";
 	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 "${DEFAULT_TARBALL_SRC_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_SRC_FNAME}";
 		ex_rtl_log_msg info "Signed source tarball.";
 	fi;
 };