epm repack common.sh: add get_desktop_value()

repack.d/common.sh

@@ -579,6 +579,13 @@ use_system_xdg()
     done
 }
 
+get_desktop_value()
+{
+    local DESKTOPFILE="$1"
+    local FIELD="$2"
+    cat "$DESKTOPFILE" | grep "^$FIELD=" | head -n1 | sed -e 's|^'"$FIELD"'=||' -e 's| .*||'
+}
+
 
 [ -d "$BUILDROOT" ] || fatal "Run me only via epm repack <package>"
 

repack.d/generic-default.sh

@@ -32,7 +32,8 @@ if [ -f "$BUILDROOT$PRODUCTDIR/$PRODUCT" ] ; then
 fi
 
 if [ -f $BUILDROOT/usr/share/applications/*.desktop ] ; then
-    EXEC="$(cat $BUILDROOT/usr/share/applications/*.desktop | grep "^Exec=" | head -n1 | sed -e 's|Exec=||' -e 's| .*||')"
+    EXEC="$(get_desktop_value "$BUILDROOT/usr/share/applications/*.desktop" "Exec")"
+    # replace /opt path with command name only
     if [ "/usr/bin/$(basename "$EXEC")" = "/usr/bin/$PRODUCT" ] || [ "$EXEC" = "$PRODUCTDIR/$PRODUCT" ] ; then
         if [ -x $BUILDROOT/usr/bin/$PRODUCT ] ; then
             fix_desktop_file "$EXEC"