Changes between Initial Version and Version 2 of Ticket #2199


Ignore:
Timestamp:
07/16/2008 07:13:04 PM (16 years ago)
Author:
bdubbs@…
Comment:

The == construct is correct for bash. You may be using sh as a symbolic link to something other than bash.

I will change #!/bin/sh to #!/bin/bash in process-scripts.sh. The change from sh to bash in the Makefile should not be required, because the first lines of both scripts now specify bash, but I made them anyway.

Also, do not put a relatively long diff in the ticket description. Put it in a comment or an attachment.

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #2199

    • Property Resolution → fixed
    • Property Status new → closed

  • Ticket #2199 – Description

    initial v2  
    11=== Proposed Changes ===
    22
    3 {{{
    43Making the LFS  failed for me. To fix the problem I corrected a typo in process-scripts.sh.
    54'=' is the correct string comparison operator.
    … …  
    87that 'popd', and 'pushd' are not available while running in the 'sh' shell.
    98
    10 --This line, and those below, will be ignored--
    11 
    12 M    process-scripts.sh
    13 M    Makefile
    14 }}}
    15 
    16 === svn diff ===
    17 
    18 {{{
    19 Index: process-scripts.sh
    20 ===================================================================
    21 --- process-scripts.sh  (revision 8551)
    22 +++ process-scripts.sh  (working copy)
    23 @@ -1,4 +1,4 @@
    24 -#!/bin/sh
    25 + #!/bin/sh
    26  
    27  # Boot scripts
    28  for s in bootscripts/lfs/init.d/*                    \
    29 @@ -9,12 +9,12 @@
    30    script=$(basename $s)
    31    
    32    # Skip directories
    33 -  [ $script == 'network-devices' ] && continue
    34 -  [ $script == 'services'        ] && continue
    35 +  [ $script = 'network-devices' ] && continue
    36 +  [ $script = 'services'        ] && continue
    37  
    38    # Disambiguate duplicate file names
    39 -  [ $s == 'bootscripts/lfs/sysconfig/rc'      ] && script='rc-sysinit';
    40 -  [ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit';
    41 +  [ $s = 'bootscripts/lfs/sysconfig/rc'      ] && script='rc-sysinit';
    42 +  [ $s = 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit';
    43    
    44    sed  -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g'   -e 's/>/\&gt\;/g' \
    45         -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/    /g'  \
    46 Index: Makefile
    47 ===================================================================
    48 --- Makefile    (revision 8551)
    49 +++ Makefile    (working copy)
    50 @@ -84,7 +84,7 @@
    51         $(Q)xmllint --nonet --noent --xinclude --postvalid \
    52           -o $(RENDERTMP)/lfs-full.xml index.xml
    53         $(Q)rm -f appendices/*.script
    54 -       $(Q)sh aux-file-data.sh $(RENDERTMP)/lfs-full.xml
    55 +       $(Q)bash aux-file-data.sh $(RENDERTMP)/lfs-full.xml
    56  
    57  maketar:
    58         @echo "Making tarballs..."
    59 
    60 }}}