Ticket #73: desktop.2.diff

makepackage

@@ -584 +584 @@
-        # **********************************************************
-        #  2.3 Meta Sanity checks
-        # **********************************************************
-
+&& "$PACKAGEDESKTOP" == "" 
-        if [[ "$SHORTNAME" == "" ]]; then red; outn "FAIL: "; normal; out "No ShortName key found in the [Meta] section."; cleanUp; return 1; fi
-        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
-        if [[ "$SOFTWAREVERSION" == "" ]]; then red; outn "FAIL: "; normal; out "No SoftwareVersion key found in the [Meta] section, please add one"; cleanUp; return 1; fi
@@ -778 +778 @@
-                ROOTINSTALLONLY="No"
-        fi
-
-        if [ -n "$PACKAGEFILENAME" ] &&  `echo "$PACKAGEFILENAME" | grep -q -v '\.package$'`; then
-                red; outn "WARNING: "; normal; out "PackageFileName '%s' should have a .package suffix. Please change the value of the filename to end in '.package' ." "$PACKAGEFILENAME"
-                trace adjusting PACKAGEFILENAME to be $PACKAGEFILENAME.package
-                PACKAGEFILENAME=$( echo "$PACKAGEFILENAME".package )
-        elif [ -z "$PACKAGEFILENAME" ]; then
-                if [[ "$AUTOPACKAGETARGET" == "1.0" ]]; then
-                        if (( PACKAGEVERSION > 1 )); then
-                                PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package"
-                        else
-                                PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION.x86.package"
-                        fi
-                else
-                        if (( PACKAGEVERSION > 1 )); then
-                                PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION-$PACKAGEVERSION.package"
-                        else
-                                PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION.package"
-                        fi
-                fi
-        fi
-
-        PACKAGEREPORTING=`echo "$PACKAGEREPORTING" | tr [:upper:] [:lower:]`
-        if [[ "$PACKAGEREPORTING" == "yes" ]]; then
-                PACKAGEREPORTING="Yes"
@@ -1724 +1704 @@
-
-        fi
-
+        if [[ "$DISPLAYNAME" == "" ]]; then red; outn "FAIL: "; normal; out "No DisplayName key found neither in the [Meta] section nor in $PACKAGEDESKTOP. You need one"; cleanUp; return 1; fi 
+
-        # translate meta_desktop_languages to be a list
-        meta_desktop_languages=`echo "$meta_desktop_languages" | sort | uniq`
-        for line in $meta_desktop_languages; do
@@ -1970 +1952 @@
-        echo
-        source "$metadata_dir/apkg-environment.en"
-
+        if [ -n "$PACKAGEFILENAME" ] &&  `echo "$PACKAGEFILENAME" | grep -q -v '\.package$'`; then
+                red; outn "WARNING: "; normal; out "PackageFileName '%s' should have a .package suffix. Please change the value of the filename to end in '.package' ." "$PACKAGEFILENAME"
+                trace adjusting PACKAGEFILENAME to be $PACKAGEFILENAME.package
+                PACKAGEFILENAME=$( echo "$PACKAGEFILENAME".package )
+        elif [ -z "$PACKAGEFILENAME" ]; then
+                if [[ "$AUTOPACKAGETARGET" == "1.0" ]]; then
+                        if (( PACKAGEVERSION > 1 )); then
+                                PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package"
+                        else
+                                PACKAGEFILENAME="$SHORTNAME-$SOFTWAREVERSION.x86.package"
+                        fi
+                else
+                        if (( PACKAGEVERSION > 1 )); then
+                                PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION-$PACKAGEVERSION.package"
+                        else
+                                PACKAGEFILENAME="$DISPLAYNAME $SOFTWAREVERSION.package"
+                        fi
+                fi
+        fi
+
-        # generate .package and .package.meta for all types
-        cp "${TMP}/apkg-stub" "$PACKAGEFILENAME"
-        cat "${TMP}/apkg-payload-meta.$$" >> "$PACKAGEFILENAME"