Changeset 28

Show
Ignore:
Timestamp:
05/28/05 00:11:53 (3 years ago)
Author:
athomas
Message:
  • Not using 'grep -q' in order to make transition to non-Linux systems less painful.
  • Stopped using cpio as it made all intermediate paths 700. Not helpful.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bpkg/trunk/bpkg

    r27 r28  
    5757        else 
    5858                case $1 in 
    59                         black|red|green|brown|blue|magenta|cyan|white|bold|underline|reverse) break ;; 
     59                        black|red|green|brown|blue|magenta|cyan|white|bold|underline|reverse) return 0 ;; 
    6060                        *) return 1 ;; 
    6161                esac 
    …… 
    9393installer() 
    9494{ 
     95        umask 022 
    9596        which installwatch > /dev/null 2>&1 || error "installwatch is required by $SELF" 
    9697        unset INSTALLWATCH_BACKUP_PATH 
    …… 
    101102        if [ $BACKUP = 1 -a -d $INSTALLWATCH_BACKUP_PATH ]; then 
    102103                notice "Archiving backup to $INSTALLWATCH_BACKUP_PATH.tar.gz" 
    103                 tar cfz $INSTALLWATCH_BACKUP_PATH.tar.gz $INSTALLWATCH_BACKUP_PATH 2> /dev/null || error "backup archiving failed" 
     104                (cd $INSTALLWATCH_BACKUP_PATH && tar cfz $INSTALLWATCH_BACKUP_PATH.tar.gz . 2> /dev/null) || error "backup archiving failed" 
    104105                rm -rf $INSTALLWATCH_BACKUP_PATH 
    105106        fi 
    …… 
    107108        # Move filtered file list into $DESTROOT 
    108109        cat $INSTALLLOG | awk '{print $3 "\n" $4}' | egrep -v "^(${IGNOREPATHS// /|}|$SRCDIR)" | sort | uniq | while read FILE; do 
    109                 [ -e "$FILE" -a ! -d "$FILE" ] && echo "$FILE" 
    110         done | cpio -pamd $DESTROOT 2> /dev/null 
     110                if [ -e "$FILE" -a ! -d "$FILE" ]; then 
     111                        mkdir -p "$DESTROOT/`dirname $FILE`" 
     112                        cp -a "$FILE" "$DESTROOT/`dirname $FILE`" 
     113                fi 
     114        done 
    111115} 
    112116 
    …… 
    149153 
    150154        build() { 
    151                 cp -a $DESTROOT/ \$startdir/pkg 
     155                cp -a $DESTROOT/* \$startdir/pkg/ 
    152156        } 
    153157        EOF 
    …… 
    190194quitloop=0 
    191195while [ $quitloop = 0 -a $# != 0 ]; do 
    192         if [[ -f $1 || "$AUTOEXTRACT" = ftp://* || "$AUTOEXTRACT" = http://* ]]; then 
     196        if [[ -f "$1" || "$1" = ftp://* || "$1" = http://* ]]; then 
    193197                AUTOEXTRACT="$1" 
    194198                if [[ "$AUTOEXTRACT" == *bz2 || "$AUTOEXTRACT" == *tbz ]]; then 
    …… 
    203207                # Download package? 
    204208                if [[ "$AUTOEXTRACT" = ftp://* || "$AUTOEXTRACT" = http://* ]]; then 
     209                        notice "Downloading $AUTOEXTRACT" 
    205210                        $DOWNLOADER "$AUTOEXTRACT" || error "downloader failed" 
    206211                        AUTOEXTRACT=`basename "$AUTOEXTRACT"` 
    …… 
    283288if [ $SKIPCONFIGURE = 0 ]; then 
    284289        if [ -x ./configure ]; then 
    285                 if ! grep -iq autoconf ./configure; then 
     290                if ! grep -i autoconf ./configure > /dev/null; then 
    286291                        notice "./configure does not seem to be generated by autoconf, running anyway" 
    287292                fi 
    …… 
    299304                test -r $MAKEFILE || error "can't determine makefile (tried Makefile and makefile)" 
    300305                # Change /usr/local to /usr 
    301                 if grep -q /usr/local $MAKEFILE; then 
     306                if grep /usr/local $MAKEFILE > /dev/null; then 
    302307                        notice "changing all instances of /usr/local to /usr in $MAKEFILE" 
    303308                        sed -i 's,/usr/local,/usr,g' $MAKEFILE 
    …… 
    326331make || error "'make failed'" 
    327332 
    328 declare -F | grep -q " packager_$PACKAGER\$" || error "no such packager $PACKAGER" 
     333declare -F | grep " packager_$PACKAGER\$" > /dev/null || error "no such packager $PACKAGER" 
    329334 
    330335eval packager_$PACKAGER