summaryrefslogtreecommitdiffhomepage
path: root/999.tarballs.build
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-07-11 20:18:10 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-07-11 21:04:29 +0000
commitafe7b9141ff0195abdee88aea8e15bda9c0f573f (patch)
tree55650542cd78eeb14c13228acef6b60c9f22096e /999.tarballs.build
parenta4b0f4f26fd5f4b958039ae8fe64d821860f595d (diff)
downloadmidipix_build-afe7b9141ff0195abdee88aea8e15bda9c0f573f.tar.bz2
midipix_build-afe7b9141ff0195abdee88aea8e15bda9c0f573f.tar.xz
Replaces rm_if_exists() [-m] [-c] w/ secure_rm(), insecure_mkdir(), and secure_cd().
secure_{rm,cd}() verify whether all pathnames supplied are rooted beneath ${PREFIX_ROOT}.
Diffstat (limited to '999.tarballs.build')
-rw-r--r--999.tarballs.build14
1 files changed, 9 insertions, 5 deletions
diff --git a/999.tarballs.build b/999.tarballs.build
index 7be57a33..e815b77e 100644
--- a/999.tarballs.build
+++ b/999.tarballs.build
@@ -27,12 +27,16 @@ TARBALL_FNAME=${TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_S
TARBALL_SRC_FNAME=${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX};
PREFIX_BASENAME=${PREFIX_NATIVE##*/};
-rm_if_exists -m ${PREFIX_BASENAME}/lib.bak;
+secure_rm ${PREFIX_BASENAME}/lib.bak;
+insecure_mkdir ${PREFIX_BASENAME}/lib.bak;
tar -C ${PREFIX_BASENAME}/lib -cpf - . | tar -C ${PREFIX_BASENAME}/lib.bak -xpf -;
log_msg info "Backed up ${PREFIX_BASENAME}/lib.";
-find native/lib -maxdepth 1 -type l \
- -exec sh -c '[ -f "${DEST:=native/lib/$(readlink -- "${0}")}" ] && \
- rm -f -- "${0}" && ln -f -- "${DEST}" "${0}"' {} \;;
+for __ in $(find native/lib -maxdepth 1 -type l -printf '%P\n'); do
+ ___="native/lib/$(readlink -- ${__})";
+ if [ -f "${___}" ]; then
+ secure_rm ${__}; ln -f -- "${___}" "${__}";
+ fi;
+done;
log_msg info "Converted symbolic links in ${PREFIX_BASENAME}/lib to hard links.";
tar -cpf - $(find . -maxdepth 2 -mindepth 1 -type d \
@@ -47,7 +51,7 @@ if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] &&\
--local-user "${TARBALL_SIGN_GPG_KEY}" --sign ${TARBALL_FNAME};
log_msg info "Signed binary distribution tarball.";
fi;
-rm -rf -- ${PREFIX_BASENAME}/lib; mv -- ${PREFIX_BASENAME}/lib.bak ${PREFIX_BASENAME}/lib;
+secure_rm ${PREFIX_BASENAME}/lib; mv -- ${PREFIX_BASENAME}/lib.bak ${PREFIX_BASENAME}/lib;
log_msg info "Restored ${PREFIX_BASENAME}/lib.";
if [ "${BUILD}" = "debug" ]; then