Changeset 4609

Timestamp:

May 5, 2017, 2:26:02 PM (2 years ago)

Author:

Juanma

Message:

Add category "GTK" to the desktop when it only has one non-freedesktop category

File:

• devtools/desktop_to_xml/desktop_to_xml.sh (modified) (8 diffs)

devtools/desktop_to_xml/desktop_to_xml.sh

@@ -13 +13 @@
 msg_selected_file="\nSelected file: %s\n\n"
 msg_select_dir="\nSelect the dir containing the desktop file:\n"
-msg_gen_metainfo="Generating metainfo data path\n"
+msg_gen_metainfo="Generating metainfo data path %s\n"
 msg_parsing_desktop="Parsing %s\n"
 msg_metainfo_generated="\nMetainfo file generated.\n"
@@ -27 +27 @@
 msg_rules_old_format="\n********** WARNING!!!! **********\nrules file has an old format.\nIt's HIGHLY recommended to update it to the new rules format.\n *************************** \n"
 msg_select_pkg="\nSelect the name of the package to process\n"
+msg_desktop_not_found="\nDesktop file not found at %s. Process aborted.\n"
 
 function usage_help
@@ -178 +179 @@
         #Find the desktop file of the application
         desktopFiles=$(find . -name "*.desktop")
-        printf "$msg_gen_metainfo"
+        if [[ ! $desktopFiles ]]
+        then
+                printf "$msg_desktop_not_found" $wrkDir
+                exit 1
+        fi
         for desktopFile in $desktopFiles
         do
@@ -194 +199 @@
                 fi
                 metainfoDir=$metainfoDir"/metainfo"
+                printf "$msg_gen_metainfo" $metainfoDir
                 mkdir $metainfoDir -p
                 parse_desktop $metainfoDir $desktopFile
@@ -261 +267 @@
                                 commentArrayIndex++
                         } else if ($1=="Categories") {
+                                customCat=0
+                                countCat=0
                                 split($2,array,";",seps)
                                 for (catIndex in array)
@@ -266 +274 @@
                                         if (array[catIndex]!="")
                                         {
-                                                if (array[catIndex]~"LliureX-")
+                                                if (array[catIndex]~"-")
                                                 {
+                                                        customCat=1
                                                         split(array[catIndex],lliurexCats,"-",seps)
                                                         for (lliurexCatIndex in lliurexCats)
@@ -277 +286 @@
                                                         categoryArray[catIndex]="<category>"array[catIndex]"</category>"
                                                 }
+                                                countCat++
                                         }
+                                }
+                                if (customCat==1 && countCat==1)
+                                {
+                                        if (substr($0,length($0),1)==";")
+                                                $0=$0"GTK"
+                                        else
+                                                $0=$0;"GTK"
                                 }
                         } else  if ($1=="Icon") {
@@ -285 +302 @@
                                 $0=$1"="iconBaseName
         #                       split(iconBaseName,array,".",seps)
-                                tagIcon="<icon type=\"cached\">"iconBaseName"</icon>";
+                                tagIcon="<icon type=\"stock\">"iconBaseName"</icon>";
                         } else if ($1=="Exec") {
                                 if (execPrinted==0)