Changeset 2322

Show
Ignore:
Timestamp:
04/22/07 23:45:25 (2 years ago)
Author:
taj
Message:

Mon Apr 23 03:40:54 UTC 2007 Taj Morton <tajmorton@gmail.com>
* main/makepackage: Warn about lack of apkg support code instead of failing silently. Thanks Eugene Zolenko. Fixes #15.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • main/trunk/ChangeLog

    r2318 r2322  
     1Mon Apr 23 03:40:54 UTC 2007  Taj Morton  <tajmorton@gmail.com> 
     2        * makepackage: Warn about lack of apkg support code instead of failing 
     3          silently. Thanks Eugene Zolenko. Fixes #15. 
     4 
    15Sun Apr  8 01:26:32 UTC 2007  Curtis L. Knight  <knighcl@gmail.com> 
    26        * share/apkg-bashlib: [stripDupedItems] Update function to pass unit test 

  • main/trunk/makepackage

    r2280 r2322  
    13441344        # if making a sealed installer package - add packages to $metadata_dir 
    13451345        # support code package is required to be included in the packages directory - gtkfe inclusion is highly recommended 
    1346         if [ -d "$source_dir/autopackage/packages" ]; then 
    1347                 ls_1=`ls "$source_dir/autopackage/packages" | wc -l` 
    1348                 if (( ls_1 > 0 )) && [ -f "$source_dir/autopackage/packages/autopackage.tar.bz2" ] && [ -f "$source_dir/autopackage/packages/autopackage-gtk-$autopackage_version.package" ]; then 
    1349                         cp -Rfv "$source_dir/autopackage/packages" "$metadata_dir" 
    1350                 elif [ ! -f "$source_dir/autopackage/packages/autopackage.tar.bz2" ]; then 
    1351                         red; outn "FAIL: "; normal; out "Using this package as a sealed installer requires that %s is included in the autopackage/packages directory." "autopackage.tar.bz2"; 
     1346        if ! dirIsEmpty "$source_dir/autopackage/packages"; then 
     1347                normal; out "Making sealed package." 
     1348                if [ ! -f "$source_dir/autopackage/packages/autopackage.tar.bz2" ]; then 
     1349                        red; outn "FAIL: "; normal; out "Using this package as a sealed installer requires that autopackage.tar.bz2 is included in the autopackage/packages directory." 
    13521350                        exit 1 
    13531351                fi 
    1354         fi 
    1355  
     1352                 
     1353                if [ ! -f "$source_dir/autopackage/packages/autopackage-gtk-$autopackage_version.package" ]; then 
     1354                        red; outn "WARNING: "; normal; out "When using this package as a sealed installer, it's highly recommended that %s is included in the autopackage/packages directory." "autopackage-gtk-$autopackage_version.package" 
     1355                fi 
     1356                 
     1357                green; outn "Adding contents of: "; normal; out "$source_dir/autopackage/packages" 
     1358                cp -Rf "$source_dir/autopackage/packages" "$metadata_dir" 
     1359        fi 
    13561360 
    13571361        # **********************************************************