tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xbps-src: cleaned up usage of mktemp(1).

Browse Source 
This one was on my TODO for a long while... fixes unportable
arguments (checked with the NetBSD's manual page).
This commit is contained in:
Juan RP 2019-06-17 15:10:16 +02:00
parent ea7a6e858d
commit f59b295903
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/chroot-style/proot.sh
View File

@ -18,7 +18,7 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
fi fi
# proot does not properly return the resultcode. Workaround this # proot does not properly return the resultcode. Workaround this
RESULT=$(mktemp /tmp/proot_result.XXXXXXXXXX) RESULT=$(mktemp || exit 1)
PROOT_NO_SECCOMP=1 proot -r $MASTERDIR -w / -b "$RESULT:/.result" -b $DISTDIR:/void-packages \ PROOT_NO_SECCOMP=1 proot -r $MASTERDIR -w / -b "$RESULT:/.result" -b $DISTDIR:/void-packages \
${HOSTDIR:+-b $HOSTDIR:/host} -b /proc:/proc -b /dev:/dev \ ${HOSTDIR:+-b $HOSTDIR:/host} -b /proc:/proc -b /dev:/dev \

2
common/hooks/post-install/04-create-xbps-metadata-scripts.sh
View File

@ -12,7 +12,7 @@ _add_trigger() {
process_metadata_scripts() { process_metadata_scripts() {
local action="$1" local action="$1"
local action_file="$2" local action_file="$2"
local tmpf=$(mktemp) local tmpf=$(mktemp || exit 1)
local fpattern="s|${PKGDESTDIR}||g;s|^\./$||g;/^$/d" local fpattern="s|${PKGDESTDIR}||g;s|^\./$||g;/^$/d"
local targets= f= _f= info_files= home= shell= descr= groups= local targets= f= _f= info_files= home= shell= descr= groups=
local found= triggers_found= _icondirs= _schemas= _mods= _tmpfiles= local found= triggers_found= _icondirs= _schemas= _mods= _tmpfiles=

2
common/hooks/pre-pkg/04-generate-runtime-deps.sh
View File

@ -61,7 +61,7 @@ hook() {
return 0 return 0
fi fi
depsftmp=$(mktemp -t xbps_src_depstmp.XXXXXXXXXX) || return 1 depsftmp=$(mktemp || exit 1)
find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null
exec 3<&0 # save stdin exec 3<&0 # save stdin

2
common/hooks/pre-pkg/06-shlib-provides.sh
View File

@ -5,7 +5,7 @@ collect_sonames() {
local _destdir="$1" f _soname _fname _pattern local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$" local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$" local _versioned_pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)+$"
local _tmpfile="$(mktemp)" local _tmpfile="$(mktemp || exit 1)"
if [ ! -d ${_destdir} ]; then if [ ! -d ${_destdir} ]; then
rm -f ${_tmpfile} rm -f ${_tmpfile}

2
common/xbps-src/libexec/build.sh
View File

@ -131,7 +131,7 @@ fi
# the bootstrap pkgs from scratch. # the bootstrap pkgs from scratch.
if [ -z "$CHROOT_READY" -a "$PKGNAME" = "base-files" ]; then if [ -z "$CHROOT_READY" -a "$PKGNAME" = "base-files" ]; then
msg_normal "Installing $PKGNAME into masterdir...\n" msg_normal "Installing $PKGNAME into masterdir...\n"
_log=$(mktemp --tmpdir || exit 1) _log=$(mktemp || exit 1)
XBPS_ARCH=$XBPS_MACHINE $XBPS_INSTALL_CMD -yf $PKGNAME >${_log} 2>&1 XBPS_ARCH=$XBPS_MACHINE $XBPS_INSTALL_CMD -yf $PKGNAME >${_log} 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_red "Failed to install $PKGNAME into masterdir, see below for errors:\n" msg_red "Failed to install $PKGNAME into masterdir, see below for errors:\n"

2
common/xbps-src/shutils/bulk.sh
View File

@ -30,7 +30,7 @@ bulk_sortdeps() {
fi fi
done done
tmpf=$(mktemp) tmpf=$(mktemp || exit 1)
# Now make the real dependency graph of all pkgs to build. # Now make the real dependency graph of all pkgs to build.
# Perform a topological sort of all pkgs but only with build dependencies # Perform a topological sort of all pkgs but only with build dependencies
# that are found in previous step. # that are found in previous step.

2
common/xbps-src/shutils/common.sh
View File

@ -5,7 +5,7 @@ run_func() {
: ${funcname:=$func} : ${funcname:=$func}
logpipe=$(mktemp -u --tmpdir=${XBPS_STATEDIR} ${pkgname}_${XBPS_CROSS_BUILD}_XXXXXXXX.logpipe) logpipe=$(mktemp -u -p ${XBPS_STATEDIR} ${pkgname}_${XBPS_CROSS_BUILD}_XXXXXXXX.logpipe || exit 1)
logfile=${XBPS_STATEDIR}/${pkgname}_${XBPS_CROSS_BUILD}_${funcname}.log logfile=${XBPS_STATEDIR}/${pkgname}_${XBPS_CROSS_BUILD}_${funcname}.log
msg_normal "${pkgver:-xbps-src}: running ${desc:-${func}} ...\n" msg_normal "${pkgver:-xbps-src}: running ${desc:-${func}} ...\n"

6
common/xbps-src/shutils/cross.sh
View File

@ -6,7 +6,7 @@ remove_pkg_cross_deps() {
cd $XBPS_MASTERDIR || return 1 cd $XBPS_MASTERDIR || return 1
msg_normal "${pkgver:-xbps-src}: removing autocrossdeps, please wait...\n" msg_normal "${pkgver:-xbps-src}: removing autocrossdeps, please wait...\n"
tmplogf=$(mktemp) tmplogf=$(mktemp || exit 1)
if [ -z "$XBPS_REMOVE_XCMD" ]; then if [ -z "$XBPS_REMOVE_XCMD" ]; then
source_file $XBPS_CROSSPFDIR/${XBPS_CROSS_BUILD}.sh source_file $XBPS_CROSSPFDIR/${XBPS_CROSS_BUILD}.sh
@ -37,7 +37,7 @@ prepare_cross_sysroot() {
[ $? -eq 0 ] && return 0 [ $? -eq 0 ] && return 0
msg_normal "Installing $cross cross pkg: cross-vpkg-dummy ...\n" msg_normal "Installing $cross cross pkg: cross-vpkg-dummy ...\n"
errlog=$(mktemp) errlog=$(mktemp || exit 1)
$XBPS_INSTALL_XCMD -Syfd cross-vpkg-dummy &>$errlog $XBPS_INSTALL_XCMD -Syfd cross-vpkg-dummy &>$errlog
rval=$? rval=$?
if [ $rval -ne 0 -a $rval -ne 17 ]; then if [ $rval -ne 0 -a $rval -ne 17 ]; then
@ -71,7 +71,7 @@ install_cross_pkg() {
check_installed_pkg cross-${XBPS_CROSS_TRIPLET}-0.1_1 check_installed_pkg cross-${XBPS_CROSS_TRIPLET}-0.1_1
[ $? -eq 0 ] && return 0 [ $? -eq 0 ] && return 0
errlog=$(mktemp) errlog=$(mktemp || exit 1)
msg_normal "Installing $cross cross compiler: cross-${XBPS_CROSS_TRIPLET} ...\n" msg_normal "Installing $cross cross compiler: cross-${XBPS_CROSS_TRIPLET} ...\n"
$XBPS_INSTALL_CMD -Syfd cross-${XBPS_CROSS_TRIPLET} &>$errlog $XBPS_INSTALL_CMD -Syfd cross-${XBPS_CROSS_TRIPLET} &>$errlog
rval=$? rval=$?

2
common/xbps-src/shutils/pkgtarget.sh
View File

@ -48,7 +48,7 @@ remove_pkg_autodeps() {
cd $XBPS_MASTERDIR || return 1 cd $XBPS_MASTERDIR || return 1
msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n" msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n"
tmplogf=$(mktemp) tmplogf=$(mktemp || exit 1)
remove_pkg_cross_deps remove_pkg_cross_deps
$XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1 $XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1