nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

setup.sh: add quotes where semantically valid

Browse Source
This commit is contained in:
happysalada 2021-06-23 16:35:59 +09:00 committed by Raphael Megzari
parent 5f01543070
commit faca9440fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/setup.sh
View File

@ -1218,7 +1218,7 @@ installCheckPhase() {
echo "no Makefile or custom installCheckPhase, doing nothing" echo "no Makefile or custom installCheckPhase, doing nothing"
#TODO(@oxij): should flagsArray influence make -n? #TODO(@oxij): should flagsArray influence make -n?
elif [[ -z "${installCheckTarget:-}" ]] \ elif [[ -z "${installCheckTarget:-}" ]] \
&& ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" >/dev/null 2>&1; then
echo "no installcheck target in ${makefile:-Makefile}, doing nothing" echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
else else
IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags" IFS=" " read -r -a makeFlagsTemp <<< "$makeFlags"
@ -1253,7 +1253,7 @@ distPhase() {
local flagsArray=( local flagsArray=(
"${distFlagsTemp[@]}" "${distFlagsTemp[@]}"
${distFlagsArray+"${distFlagsArray[@]}"} ${distFlagsArray+"${distFlagsArray[@]}"}
${distTarget:-dist} "${distTarget:-dist}"
) )
echo 'dist flags: %q' "${flagsArray[@]}" echo 'dist flags: %q' "${flagsArray[@]}"