aboutsummaryrefslogtreecommitdiff
path: root/common/hooks
diff options
context:
space:
mode:
authorPiotr Wójcik <chocimier@tlen.pl>2020-09-02 17:04:41 +0000
committerPiotr <chocimier@tlen.pl>2020-09-03 19:03:32 +0000
commit6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7 (patch)
tree06df082169528e7000deea5e34280f6094e8831a /common/hooks
parent4c29e554b65b2b13af34826b7c209449f381599f (diff)
downloadvoid-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.tar
void-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.tar.gz
void-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.tar.bz2
void-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.tar.lz
void-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.tar.xz
void-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.tar.zst
void-packages-6efc7dd98d02ebdd4d4e466f50578552bbc2ecd7.zip
xbps-src: quote wrksrc to allow whitespace
Diffstat (limited to 'common/hooks')
-rw-r--r--common/hooks/do-extract/00-distfiles.sh26
-rw-r--r--common/hooks/pre-configure/01-override-config.sh4
2 files changed, 15 insertions, 15 deletions
diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index b23b9e14fd9..922f7029491 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -7,7 +7,7 @@ hook() {
local TAR_CMD
if [ -z "$distfiles" -a -z "$checksum" ]; then
- mkdir -p $wrksrc
+ mkdir -p "$wrksrc"
return 0
fi
@@ -21,7 +21,7 @@ hook() {
done
if [ -n "$create_wrksrc" ]; then
- mkdir -p ${wrksrc} || msg_error "$pkgver: failed to create wrksrc.\n"
+ mkdir -p "${wrksrc}" || msg_error "$pkgver: failed to create wrksrc.\n"
fi
# Disable trap on ERR; the code is smart enough to report errors and abort.
@@ -81,14 +81,14 @@ hook() {
case ${cursufx} in
tar|txz|tbz|tlz|tgz|crate)
- $TAR_CMD -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C $extractdir
+ $TAR_CMD -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C "$extractdir"
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
;;
gz|bz2|xz)
- cp -f $srcdir/$curfile $extractdir
- cd $extractdir
+ cp -f $srcdir/$curfile "$extractdir"
+ cd "$extractdir"
case ${cursufx} in
gz)
gunzip -f $curfile
@@ -103,12 +103,12 @@ hook() {
;;
zip)
if command -v unzip &>/dev/null; then
- unzip -o -q $srcdir/$curfile -d $extractdir
+ unzip -o -q $srcdir/$curfile -d "$extractdir"
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
elif command -v bsdtar &>/dev/null; then
- bsdtar -xf $srcdir/$curfile -C $extractdir
+ bsdtar -xf $srcdir/$curfile -C "$extractdir"
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
@@ -118,7 +118,7 @@ hook() {
;;
rpm)
if command -v rpmextract &>/dev/null; then
- cd $extractdir
+ cd "$extractdir"
rpmextract $srcdir/$curfile
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
@@ -129,19 +129,19 @@ hook() {
;;
txt)
if [ "$create_wrksrc" ]; then
- cp -f $srcdir/$curfile $extractdir
+ cp -f $srcdir/$curfile "$extractdir"
else
msg_error "$pkgname: ${curfile##*.} files can only be extracted when create_wrksrc is set\n"
fi
;;
7z)
if command -v 7z &>/dev/null; then
- 7z x $srcdir/$curfile -o$extractdir
+ 7z x $srcdir/$curfile -o"$extractdir"
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
elif command -v bsdtar &>/dev/null; then
- bsdtar -xf $srcdir/$curfile -C $extractdir
+ bsdtar -xf $srcdir/$curfile -C "$extractdir"
if [ $? -ne 0 ]; then
msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
fi
@@ -153,11 +153,11 @@ hook() {
case "$TAR_CMD" in
*bsdtar)
$TAR_CMD -xOf $srcdir/$curfile data.tar.gz | \
- $TAR_CMD -xz -C $extractdir -s ",^,${wrksrc##*/}/," -f -
+ $TAR_CMD -xz -C "$extractdir" -s ",^,${wrksrc##*/}/," -f -
;;
*)
$TAR_CMD -xOf $srcdir/$curfile data.tar.gz | \
- $TAR_CMD -xz -C $extractdir --transform="s,^,${wrksrc##*/}/,"
+ $TAR_CMD -xz -C "$extractdir" --transform="s,^,${wrksrc##*/}/,"
;;
esac
if [ $? -ne 0 ]; then
diff --git a/common/hooks/pre-configure/01-override-config.sh b/common/hooks/pre-configure/01-override-config.sh
index e9edf149896..29cd66125e2 100644
--- a/common/hooks/pre-configure/01-override-config.sh
+++ b/common/hooks/pre-configure/01-override-config.sh
@@ -4,10 +4,10 @@ hook() {
local _cfgdir="${XBPS_COMMONDIR}/environment/configure/automake"
if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then
- for f in $(find ${wrksrc} -type f -name "*config*.sub"); do
+ for f in $(find "${wrksrc}" -type f -name "*config*.sub"); do
cp -f ${_cfgdir}/config.sub ${f}
done
- for f in $(find ${wrksrc} -type f -name "*config*.guess"); do
+ for f in $(find "${wrksrc}" -type f -name "*config*.guess"); do
cp -f ${_cfgdir}/config.guess ${f}
done
fi