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

* Work around an apparent bug in Bash 4.0. It no longer accepts this: 

echo $(cat <<EOF
    bla
    EOF)

  It does accept backticks:

    echo `cat <<EOF
    bla
    EOF`

svn path=/nixos/trunk/; revision=15192
This commit is contained in:
Eelco Dolstra 2009-04-20 16:26:50 +00:00
parent ed43363e2a
commit 453e9abc9e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
installer/grub-menu-builder.sh
View File

@ -37,9 +37,9 @@ fi
configurationCounter=0 configurationCounter=0
configurationLimit="@configurationLimit@" configurationLimit="@configurationLimit@"
numAlienEntries=$(cat <<EOF | egrep '^[[:space:]]*title' | wc -l numAlienEntries=`cat <<EOF | egrep '^[[:space:]]*title' | wc -l
@extraGrubEntries@ @extraGrubEntries@
EOF) EOF`
if test $((configurationLimit+numAlienEntries)) -gt 190; then if test $((configurationLimit+numAlienEntries)) -gt 190; then
configurationLimit=$((190-numAlienEntries)); configurationLimit=$((190-numAlienEntries));
@ -114,10 +114,10 @@ if test -n "@copyKernels@"; then
fi fi
# Additional entries specified verbatim by the configuration. # Additional entries specified verbatim by the configuration.
extraGrubEntries=$(cat <<EOF extraGrubEntries=`cat <<EOF
@extraGrubEntries@ @extraGrubEntries@
EOF EOF`
)
if test -n "@extraGrubEntriesBeforeNixos@"; then if test -n "@extraGrubEntriesBeforeNixos@"; then
echo "$extraGrubEntries" >> $tmp echo "$extraGrubEntries" >> $tmp