public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv-setup: Combine [[ .. ]] && [[ .. ]] into one [[ .. && .. ]]

Browse Source 
Also remove useless quotes on same line
This commit is contained in:
John Ericson 2017-07-13 14:56:40 -04:00
parent 5d693c84d2
commit 273a4c1c78
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -742,7 +742,7 @@ configurePhase() {
buildPhase() { buildPhase() {
runHook preBuild runHook preBuild
if [ -z "$makeFlags" ] && ! [[ -n "$makefile" || -e "Makefile" || -e "makefile" || -e "GNUmakefile" ]]; then if [[ -z $makeFlags && ! ( -n $makefile || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then
echo "no Makefile, doing nothing" echo "no Makefile, doing nothing"
else else
# See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409