small fixes

bin/epm-programs

@@ -25,6 +25,7 @@ epm_programs()
 	local DESKTOPDIR=/usr/share/applications
 	[ -d "$DESKTOPDIR" ] || fatal "There is no $DESKTOPDIR dir on the system."
 	#find /usr/share/applications -type f -name "*.desktop" | while read f; do pkg_files="$f" quiet=1 short=1 epm_query_file ; done | sort -u
+	showcmd "find /usr/share/applications -type f -name "*.desktop" | xargs $0 -qf --quiet --short | sort -u"
 	find /usr/share/applications -type f -name "*.desktop" | \
 		xargs $0 -qf --quiet --short | sort -u
 }

bin/epm-query

@@ -104,7 +104,7 @@ separate_installed()
 {
 	pkg_installed=
 	pkg_noninstalled=
-	for i $* ; do
+	for i in $* ; do
 		is_installed $i && pkg_installed="$pkg_installed $i" || pkg_noninstalled="$pkg_noninstalled $i"
 	done
 }

bin/epm-query_file

@@ -70,7 +70,7 @@ __do_query()
             ;;
         apt-dpkg)
             showcmd dpkg -S $1
-            dpkg_print_name_version $(dpkg -S $1 | sed -e "s|:.*||")
+            dpkg_print_name_version $(dpkg -S $1 | grep -v "^diversion by" | sed -e "s|:.*||")
             return ;;
         yum-rpm|urpm-rpm)
             CMD="rpm -qf"
@@ -110,7 +110,7 @@ __do_short_query()
             ;;
         NOapt-dpkg)
             showcmd dpkg -S $1
-            dpkg_print_name_version $(dpkg -S $1 | sed -e "s|:.*||")
+            dpkg_print_name_version $(dpkg -S $1 | sed -e "s|:.*||" | grep -v "^diversion by")
             return ;;
         NOemerge)
             CMD="equery belongs"

bin/epm-simulate

@@ -33,8 +33,8 @@ __use_yum_assumeno()
 
 _epm_do_simulate()
 {
-	local CMD
-	local filenames=$@
+    local CMD
+    local filenames="$*"
 
     case $PMTYPE in
     	apt-rpm|apt-dpkg)