Changeset 4566

Timestamp:

May 4, 2017, 12:08:25 PM (2 years ago)

Author:

Juanma

Message:

Fixed packages that directly copy the desktop to a specific location in the install file

File:

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

devtools/desktop_to_xml/desktop_to_xml.sh

@@ -22 +22 @@
 msg_icon_exists="\nIcon package found on the right location. Assuming llxsrc helper exists in rules\n"
 msg_work_done="\n----------\n\nWork done. If the process has no errors please check that the appfile.xml is right and that the rules file has the llxsrc helper. Also check that the icon is present in llx-resources.\nIn other case correct the errors and relaunch the script.\n\nRemember that the generated appfile.xml isn't a full one and is missing some fields like the screenshots. Take a cup of coffee and fulfill the empty fields following the specs at https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html\n\n"
-msg_install_not_found="No install file present in debian dir. Aborting.\n"
+msg_install_not_found="Install file not found in debian dir. Aborting.\n"
 msg_select_workdir="Select the workdir\n"
 msg_debhelper_enabled="package type llxsrc detected. Setting llx-resources as workdir\n"
@@ -60 +60 @@
         index=0
         let count--
-        if [ $count -gt 0 ]
-        then
-                printf "$msg_select_file"
-                for i in `seq 0 ${count}`
-                do
-                        printf "${i}) ${installFiles[$i]}\n"
-                done
-                printf "Select file [0]: "
-                read index
-                [ -z $index ] && index=0
-                installFile=${installFiles[$index]}
-                printf "$msg_selected_file" $installFile
-                process_installFile ${installFile}
-        elif [[ $installFiles[0]=='*install' ]]
+        if [[ ${installFiles[0]} = '*install' ]]
         then
                 printf "$msg_install_not_found"
                 get_workdir
                 debhelper_mode=1
+        else
+                if [ $count -gt 0 ]
+                then
+                        printf "$msg_select_file"
+                        for i in `seq 0 ${count}`
+                        do
+                                printf "${i}) ${installFiles[$i]}\n"
+                        done
+                        printf "Select file [0]: "
+                        read index
+                        [ -z $index ] && index=0
+                        installFile=${installFiles[$index]}
+                else
+                        installFile=${installFiles[0]}
+                fi
+                printf "$msg_selected_file" $installFile
+                process_installFile ${installFile}
         fi
 }
@@ -109 +113 @@
 {
         installFile=$1
+        wc -l $installFile
         if [ `wc -l $installFile  | cut -f1 -d ' '` -gt 1 ]
         then 
@@ -134 +139 @@
 {
         cd $rootDir"/"$srcDir
-        printf "Entering $1\n"
-        cd $1
+        wrkDir=$1
+        printf "Entering $wrkDir\n"
+        if [ -d wrkDir ]
+        then
+                cd $wrkDir
+        else
+                wrkDir=`dirname $wrkDir`
+                cd $wrkDir
+        fi
+
         #Find the desktop file of the application
         desktopFiles=$(find . -name "*.desktop")
@@ -142 +155 @@
         do
                 cd $rootDir"/"$srcDir
-                printf "Entering $1\n"
-                cd $1
-                metainfoDir=`dirname $desktopFile`
-                metainfoDir=`dirname $metainfoDir`"/metainfo"
+                printf "Entering $wrkDir\n"
+                cd $wrkDir
+                #If workdir != $1 then it means that the install file has a file and not a dir
+                #In this case we assume that the install is putting the desktop file so metainfoDir becames llx-resources directly
+                if [[ $wrkDir != $1 ]]
+                then
+                        appName=$(basename $pkgDir)
+                        metainfoDir=${rootDir}"/"${srcDir}"/llx-resources/"${appName}
+                else
+                        metainfoDir=`dirname $desktopFile`
+                        metainfoDir=`dirname $metainfoDir`
+                fi
+                metainfoDir=$metainfoDir"/metainfo"
                 mkdir $metainfoDir -p
                 parse_desktop $metainfoDir $desktopFile
@@ -305 +327 @@
                         cd $srcDir
                         appName=$(basename $pkgDir)
-                        resourcesDir="llx-resources/"${appName}"/icons/"
+                        resourcesDir="llx-resources/"${appName}"/icons/apps/"
                         mkdir $resourcesDir -p
                         cd $OLDPWD