Changeset 2574

Show
Ignore:
Timestamp:
07/31/07 21:43:17 (1 year ago)
Author:
dhozac
Message:

Use findFile consistently. Don't fail if a file doesn't exist, these are all optional.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/scripts/vserver-build.debootstrap

    r2571 r2574  
    3232                     "$__CONFDIR"/.defaults/apps/debootstrap/mirror \ 
    3333                     "$__DISTRIBDIR"/"$DISTRIBUTION"/debootstrap.mirror \ 
    34                      "$__PKGLIBDEFAULTDIR"/debootstrap.mirror 
     34                     "$__PKGLIBDEFAULTDIR"/debootstrap.mirror '' 
    3535        test -z "$aux" || read MIRROR <"$aux" 
    3636    } 
    3737    local file 
    3838    findFile file "$__CONFDIR"/.distributions/"$DISTRIBUTION"/debootstrap.options \ 
    39                   "$__CONFDIR"/.defaults/apps/debootstrap/options 
     39                  "$__CONFDIR"/.defaults/apps/debootstrap/options '' 
    4040    test -z "$file" || read options <"$file" 
    4141} 
     
    156156 
    157157if test -z "$script"; then 
    158     for s in "$__CONFDIR/.distributions/$DISTRIBUTION/debootstrap.script" 
    159              "$__DISTRIBDIR/$DISTRIBUTION/debootstrap.script" 
    160     do 
    161         if test -e "$s"; then 
    162             script="$s" 
    163             break 
    164         fi 
    165     done 
     158    findFile script "$__CONFDIR/.distributions/$DISTRIBUTION/debootstrap.script" \ 
     159                    "$__DISTRIBDIR/$DISTRIBUTION/debootstrap.script" '' 
    166160fi 
    167161