Update xlunch-create-entry

3 files changed, 37 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2250b7037c0..d8d89663549e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xlunch-git
 	pkgdesc = Graphical app launcher for X with little dependencies
-	pkgver = 2.4.2.r10.g6232b65
+	pkgver = 2.4.2.r45.g1687e4c
 	pkgrel = 2
 	url = http://xlunch.org/
 	arch = i686
@@ -20,10 +20,10 @@ pkgbase = xlunch-git
 	source = xlunch-conf-install.hook
 	source = xlunch-conf-remove.hook
 	md5sums = SKIP
-	md5sums = 40ad36fdfdba2889033bd2d7582f9643
+	md5sums = 58a813e6c232489f887a32966addde8a
 	md5sums = 5cedcafe1ba39961a84f1634958ca478
-	md5sums = b3e91a3ded90c24d56a42df84124df29
-	md5sums = aa9654e2adae39523d5d56abd4cbca92
+	md5sums = ccaf7547b8ceeb11badb2a08b3c592f7
+	md5sums = 832317d10246dd7b2ac17c599b19f441
 
 pkgname = xlunch-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e25856095919..3e9b7d7b3d40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=xlunch
 pkgname=xlunch-git
-pkgver=2.4.2.r10.g6232b65
+pkgver=2.4.2.r45.g1687e4c
 pkgrel=2
 pkgdesc="Graphical app launcher for X with little dependencies"
 arch=('i686' 'x86_64')
diff --git a/xlunch-create-entry b/xlunch-create-entry
index 0e9b17824e7f..6dcef1779e60 100755
--- a/xlunch-create-entry
+++ b/xlunch-create-entry
@@ -1,29 +1,43 @@
 #!/bin/bash
 
 APPS=/usr/share/applications
-ICONS=/usr/share/icons/hicolor
+PIXMAPS=/usr/share/pixmaps
+ICONS=/usr/share/icons
 SIZE=48
 
 echo "/$1" | grep ".desktop" | while read DESKTOPFILE; do
-   FDATA="$(cat $DESKTOPFILE)"
-   NAME="$(echo "$FDATA" | grep -i "^Name=" | head -n 1 | cut -d "=" -f 2-)"
-   EXEC="$(echo "$FDATA" | grep -i "^Exec=" | head -n 1 | cut -d "=" -f 2-)"
-   ICON="$(echo "$FDATA" | grep -i "^Icon=" | head -n 1 | cut -d "=" -f 2-)"
-   USETERM="$(echo "$FDATA" | grep -i "^Terminal=" | head -n 1 | cut -d "=" -f 2-)"
+  FDATA="$(cat $DESKTOPFILE)"
+  NAME="$(echo "$FDATA" | grep -i "^Name=" | head -n 1 | cut -d "=" -f 2-)"
+  EXEC="$(echo "$FDATA" | grep -i "^Exec=" | head -n 1 | cut -d "=" -f 2-)"
+  ICONNAME="$(echo "$FDATA" | grep -i "^Icon=" | head -n 1 | cut -d "=" -f 2-)"
+  USETERM="$(echo "$FDATA" | grep -i "^Terminal=" | head -n 1 | cut -d "=" -f 2-)"
+  if [ "$USETERM" = "true" ]; then
+    EXEC="$TERM -e ""$EXEC"
+  fi
 
-   if [ "$USETERM" = "true" ]; then
-      EXEC="$TERM -e ""$EXEC"
-   fi
+  if [ "$ICONNAME" != "" ]; then
+    ICON="$(find "$PIXMAPS" | grep $ICONNAME"[.]png" | head -n 1)"
+    if [ "$ICON" == "" ]; then
+      ICON="$(find "$ICONS" | grep $SIZE"x"$SIZE | grep $ICONNAME"[.]png" | head -n 1)"
+    fi
 
-   if [ "$ICON" != "" ]; then
-      ICON="$(find "$ICONS" | grep $SIZE"x"$SIZE | grep $ICON"[.]png" | head -n 1)"
-      if [ "$ICON" != "" -a "$EXEC" != "" -a "$NAME" != "" ]; then
-         echo "$NAME;$ICON;$EXEC"
-      else
-        ICON="$(find "$ICONS" | grep "scalable" | grep -E $ICON"[.](png|svg)" | head -n 1)"
-        if [ "$ICON" != "" -a "$EXEC" != "" -a "$NAME" != "" ]; then
-           echo "$NAME;$ICON;$EXEC"
+    if [ "$ICON" == "" ]; then
+      ICON="$(find "$ICONS" | grep "scalable" | grep -E $ICONNAME"[.]png" | head -n 1)"
+      if [ "$ICON" == "" ]; then
+        SVGICON="$(find "$ICONS" | grep "scalable" | grep -E $ICONNAME"[.]svg" | head -n 1)"
+        if type convert >/dev/null 2>&1; then
+          if [ "$SVGICON" != "" ]; then
+            mkdir -p "svgicons"
+            convert -size $SIZEx$SIZE -background none "$SVGICON" "svgicons/"$ICONNAME".png"
+            ICON="svgicons/"$ICONNAME".png"
+          fi
+        else
+          ICON=$SVGICON
         fi
       fi
-   fi
+    fi
+    if [ "$ICON" != "" -a "$EXEC" != "" -a "$NAME" != "" ]; then
+      echo "$NAME;$ICON;$EXEC"
+    fi
+  fi
 done | sort | uniq