Ticket #73: desktop.diff

File desktop.diff, 3.3 kB (added by Jan-Nik, 6 months ago)

Only fail when both PackageDesktop and DisplayName are missing; set $PACKAGENAME after reading DisplayName from desktop file

  • makepackage

    old new  
    584584        # ********************************************************** 
    585585        #  2.3 Meta Sanity checks 
    586586        # ********************************************************** 
    587         if [[ "$DISPLAYNAME" == "" ]]; then red; outn "FAIL: "; normal; out "No DisplayName key found in the [Meta] section. You need one"; cleanUp; return 1; fi 
     587        if [[ "$DISPLAYNAME" == "" && "$PACKAGEDESKTOP" == "" ]]; then red; outn "FAIL: "; normal; out "No DisplayName key found in the [Meta] section. You need one"; cleanUp; return 1; fi 
    588588        if [[ "$SHORTNAME" == "" ]]; then red; outn "FAIL: "; normal; out "No ShortName key found in the [Meta] section."; cleanUp; return 1; fi 
    589589        if [[ "$ROOTNAME" == "" ]]; then red; outn "FAIL: "; normal; out "You forgot the RootName key in the [Meta] section. That's pretty important you know "; cleanUp; return 1; fi 
    590590        if [[ "$SOFTWAREVERSION" == "" ]]; then red; outn "FAIL: "; normal; out "No SoftwareVersion key found in the [Meta] section, please add one"; cleanUp; return 1; fi 
    …… 
    778778                ROOTINSTALLONLY="No" 
    779779        fi 
    780780 
    781         if [ -n "$PACKAGEFILENAME" ] &&  `echo "$PACKAGEFILENAME" | grep -q -v '\.package$'`; then 
    782                 red; outn "WARNING: "; normal; out "PackageFileName '%s' should have a .package suffix. Please change the value of the filename to end in '.package' ." "$PACKAGEFILENAME" 
    783                 trace adjusting PACKAGEFILENAME to be $PACKAGEFILENAME.package 
    784                 PACKAGEFILENAME=$( echo "$PACKAGEFILENAME".package ) 
    785         elif [ -z "$PACKAGEFILENAME" ]; then 
    786                 if [[ "$AUTOPACKAGETARGET" == "1.0" ]]; then 
    787                         if (( PACKAGEVERSION > 1 )); then 
    788                                 PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package" 
    789                         else 
    790                                 PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION.x86.package" 
    791                         fi 
    792                 else 
    793                         if (( PACKAGEVERSION > 1 )); then 
    794                                 PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION-$PACKAGEVERSION.package" 
    795                         else 
    796                                 PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION.package" 
    797                         fi 
    798                 fi 
    799         fi 
    800  
    801781        PACKAGEREPORTING=`echo "$PACKAGEREPORTING" | tr [:upper:] [:lower:]` 
    802782        if [[ "$PACKAGEREPORTING" == "yes" ]]; then 
    803783                PACKAGEREPORTING="Yes" 
    …… 
    19701950        echo 
    19711951        source "$metadata_dir/apkg-environment.en" 
    19721952 
     1953        if [ -n "$PACKAGEFILENAME" ] &&  `echo "$PACKAGEFILENAME" | grep -q -v '\.package$'`; then 
     1954                red; outn "WARNING: "; normal; out "PackageFileName '%s' should have a .package suffix. Please change the value of the filename to end in '.package' ." "$PACKAGEFILENAME" 
     1955                trace adjusting PACKAGEFILENAME to be $PACKAGEFILENAME.package 
     1956                PACKAGEFILENAME=$( echo "$PACKAGEFILENAME".package ) 
     1957        elif [ -z "$PACKAGEFILENAME" ]; then 
     1958                if [[ "$AUTOPACKAGETARGET" == "1.0" ]]; then 
     1959                        if (( PACKAGEVERSION > 1 )); then 
     1960                                PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package" 
     1961                        else 
     1962                                PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION.x86.package" 
     1963                        fi 
     1964                else 
     1965                        if (( PACKAGEVERSION > 1 )); then 
     1966                                PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION-$PACKAGEVERSION.package" 
     1967                        else 
     1968                                PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION.package" 
     1969                        fi 
     1970                fi 
     1971        fi 
     1972 
    19731973        # generate .package and .package.meta for all types 
    19741974        cp "${TMP}/apkg-stub" "$PACKAGEFILENAME" 
    19751975        cat "${TMP}/apkg-payload-meta.$$" >> "$PACKAGEFILENAME"