From 820ab1fb812c925b3f679727c9658621e93d3c1f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 19 May 2019 13:31:33 +0200 Subject: [PATCH] build: use cp -R as -cp -r is actually -RL And this is being disliked by a dangling python3 -> python3.6 link. --- build/common.sh | 2 +- build/ports.sh | 2 +- build/skim.sh | 2 +- build/vm.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/common.sh b/build/common.sh index 1a7a0e8..d2289e9 100644 --- a/build/common.sh +++ b/build/common.sh @@ -429,7 +429,7 @@ setup_copy() # in case we want to clobber HEAD rm -rf ${1}${2} mkdir -p $(dirname ${1}${2}) - cp -r ${2} ${1}${2} + cp -R ${2} ${1}${2} } setup_xbase() diff --git a/build/ports.sh b/build/ports.sh index 22d62a4..6d35e34 100644 --- a/build/ports.sh +++ b/build/ports.sh @@ -105,7 +105,7 @@ trap : 2 ${ENV_FILTER} chroot ${STAGEDIR} /bin/sh -s << EOF || true # create a caching mirror for all temporary package dependencies mkdir -p ${PACKAGESDIR}-cache -cp -r ${PACKAGESDIR}/All ${PACKAGESDIR}-cache/All +cp -R ${PACKAGESDIR}/All ${PACKAGESDIR}-cache/All echo "${PORTS_LIST}" | while read PORT_ORIGIN; do FLAVOR=\${PORT_ORIGIN##*@} diff --git a/build/skim.sh b/build/skim.sh index c1a8b8c..bf0d137 100644 --- a/build/skim.sh +++ b/build/skim.sh @@ -190,7 +190,7 @@ if [ -n "${UNUSED}" ]; then echo ">>> Refreshing ${PORT}" rm -fr ${PORTSDIR}/${PORT} - cp -r ${PORTSREFDIR}/${PORT} ${PORTSDIR}/${PORT} + cp -R ${PORTSREFDIR}/${PORT} ${PORTSDIR}/${PORT} done done diff --git a/build/vm.sh b/build/vm.sh index 008f088..68ccd90 100644 --- a/build/vm.sh +++ b/build/vm.sh @@ -68,7 +68,7 @@ mount /dev/${DEV} ${STAGEDIR}/mnt setup_base ${STAGEDIR}/mnt # need these again later -cp -r ${STAGEDIR}/mnt/boot ${STAGEDIR} +cp -R ${STAGEDIR}/mnt/boot ${STAGEDIR} setup_kernel ${STAGEDIR}/mnt setup_packages ${STAGEDIR}/mnt