aboutsummaryrefslogtreecommitdiff
path: root/common/hooks/pre-pkg
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2019-06-17 15:38:07 +0000
committerJuan RP <xtraeme@gmail.com>2019-06-17 15:38:07 +0000
commit7b7d7c13a124a0039d80cf56ed041f91062f658a (patch)
tree171c25712227c88f90054a685b276862b0ff14b9 /common/hooks/pre-pkg
parent8614cca7df0752a1ee5d4b4ebffb5147b8e6ddee (diff)
downloadvoid-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.tar
void-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.tar.gz
void-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.tar.bz2
void-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.tar.lz
void-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.tar.xz
void-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.tar.zst
void-packages-7b7d7c13a124a0039d80cf56ed041f91062f658a.zip
xbps-src: exit properly if mktemp(1) fails, not from its subshell.
Thanks @huglovefan
Diffstat (limited to 'common/hooks/pre-pkg')
-rw-r--r--common/hooks/pre-pkg/04-generate-runtime-deps.sh2
-rw-r--r--common/hooks/pre-pkg/06-shlib-provides.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 9edb85ad59b..62077022711 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -61,7 +61,7 @@ hook() {
return 0
fi
- depsftmp=$(mktemp || exit 1)
+ depsftmp=$(mktemp) || exit 1
find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null
exec 3<&0 # save stdin
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index 44c452a5d9a..cdc94de3bc9 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -5,7 +5,7 @@ collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$"
- local _tmpfile="$(mktemp || exit 1)"
+ local _tmpfile=$(mktemp) || exit 1
if [ ! -d ${_destdir} ]; then
rm -f ${_tmpfile}