epm: use packagekit name for PackageKit

bin/epm-autoremove

@@ -197,7 +197,7 @@ case $PMTYPE in
 		fi
 		sudocmd aura -Oj
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon repair --autoremove
 		;;
 	yum-rpm)

bin/epm-check

@@ -37,7 +37,7 @@ case $PMTYPE in
 		sudocmd apt-get -f install || return
 		#sudocmd apt-get autoremove
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon repair
 		;;
 	aptitude-dpkg)

bin/epm-download

@@ -198,8 +198,7 @@ epm_download()
 	aptcyg)
 		sudocmd apt-cyg download $pkg_filenames
 		;;
-	packagekit-*)
-		# TODO: force
+	packagekit)
 		docmd pkcon download $pkg_filenames
 		;;
 	yum-rpm)

bin/epm-filelist

@@ -67,7 +67,7 @@ __epm_filelist_remote()
 			fi
 			docmd_foreach __deb_local_content_filelist "$@"
 			;;
-		packagekit-*)
+		packagekit)
 			docmd pkcon get-files "$@"
 			;;
 		yum-rpm)
@@ -123,7 +123,7 @@ __epm_filelist_name()
 		*-dpkg)
 			CMD="dpkg -L"
 			;;
-		packagekit-*)
+		packagekit)
 			CMD="pkcon get-files"
 			;;
 		android)

bin/epm-info

@@ -69,7 +69,7 @@ case $PMTYPE in
 			apt-rpm)
 				docmd apt-cache show $pkg_names
 				;;
-			packagekit-rpm)
+			packagekit)
 				docmd pkcon get-details $pkg_names
 				;;
 			yum-rpm)
@@ -89,7 +89,7 @@ case $PMTYPE in
 				;;
 		esac
 		;;
-	packagekit-*)
+	packagekit)
 		# TODO: get-details-local
 		docmd pkcon get-details $pkg_names
 		;;

bin/epm-install

@@ -129,7 +129,7 @@ epm_install_names()
 		urpm-rpm)
 			sudocmd urpmi $URPMOPTIONS $@
 			return ;;
-		packagekit-*)
+		packagekit)
 			docmd pkcon install $@
 			return ;;
 		pkgsrc)
@@ -233,7 +233,7 @@ epm_ni_install_names()
 			# FIXME: returns true ever no package found, need check for "no found", "Nothing to do."
 			yes | sudocmd zypper --non-interactive $ZYPPEROPTIONS install $@
 			return ;;
-		packagekit-*)
+		packagekit)
 			docmd pkcon install --noninteractive $@
 			return ;;
 		pkgsrc)
@@ -406,7 +406,7 @@ epm_install_files()
                     ;;
             esac
             ;;
-        packagekit-*)
+        packagekit)
             docmd pkcon install-local $@
             return ;;
         pkgsrc)
@@ -529,7 +529,7 @@ epm_print_install_names_command()
 		zypper-rpm)
 			echo "zypper --non-interactive $ZYPPEROPTIONS install $*"
 			return ;;
-		packagekit-*)
+		packagekit)
 			echo "pkcon --noninteractive $*"
 			return ;;
 		pacman)

bin/epm-packages

@@ -74,7 +74,7 @@ case $PMTYPE in
 		[ -n "$short" ] && CMD="rpm -qa --queryformat %{name}\n $pkg_filenames"
 		docmd $CMD
 		return ;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon get-packages --filter installed
 		;;
 	snappy)

bin/epm-policy

@@ -34,7 +34,7 @@ case $PMTYPE in
 	apt-*)
 		docmd apt-cache policy $pkg_names
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon resolve $pkg_names
 		;;
 	*)

bin/epm-reinstall

@@ -33,7 +33,7 @@ epm_reinstall_names()
 		aptitude-dpkg)
 			sudocmd aptitude reinstall $@
 			return ;;
-		packagekit-*)
+		packagekit)
 			warning "Please send me the correct command form for it"
 			docmd pkcon install --allow-reinstall $@
 			return ;;

bin/epm-release_upgrade

@@ -328,7 +328,7 @@ epm_release_upgrade()
 		assure_exists do-release-upgrade update-manager-core
 		sudocmd do-release-upgrade
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon upgrade-system $pkg_filenames
 		;;
 	yum-rpm)

bin/epm-remove

@@ -75,7 +75,7 @@ epm_remove_names()
 		apt-rpm)
 			sudocmd apt-get remove $APTOPTIONS $@
 			return ;;
-		packagekit-*)
+		packagekit)
 			docmd pkcon remove $@
 			return ;;
 		deepsolver-rpm)
@@ -170,7 +170,7 @@ epm_remove_nonint()
 		apt-rpm)
 			sudocmd apt-get -y --force-yes remove $@
 			return ;;
-		packagekit-*)
+		packagekit)
 			docmd pkcon remove --noninteractive $@
 			return ;;
 		urpm-rpm)

bin/epm-repolist

@@ -60,7 +60,7 @@ case $PMTYPE in
 	zypper-rpm)
 		docmd zypper sl -d
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon repo-list
 		;;
 	emerge)

bin/epm-requires

@@ -62,7 +62,7 @@ case $PMTYPE in
 			CMD="apt-cache depends"
 		fi
 		;;
-	packagekit-*)
+	packagekit)
 		CMD="pkcon required-by"
 		;;
 	#zypper-rpm)

bin/epm-search

@@ -34,7 +34,7 @@ case $PMTYPE in
 	deepsolver-rpm)
 		CMD="ds-require --"
 		;;
-	packagekit-*)
+	packagekit)
 		CMD="pkcon search name"
 		;;
 	urpm-rpm)

bin/epm-search_file

@@ -61,7 +61,7 @@ case $PMTYPE in
 		sudocmd apt-file update
 		docmd apt-file search $pkg_filenames
 		return ;;
-	packagekit-*)
+	packagekit)
 		CMD="pkcon search file"
 		;;
 	yum-rpm)

bin/epm-update

@@ -38,7 +38,7 @@ case $PMTYPE in
 		#sudocmd apt-get -f install || exit
 		#sudocmd apt-get autoremove
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon refresh
 		;;
 	#snappy)

bin/epm-upgrade

@@ -41,7 +41,7 @@ epm_upgrade()
 			local installlist="$(get_task_packages $pkg_names)"
 			[ -n "$verbose" ] && info "Packages from task(s): $installlist"
 			# install only installed packages (simulate upgrade packages)
-			installlist="$(estrlist exclude "$(echo "$installlist" | (skip_installed='yes' filter_out_installed_packages))" "$installlist")"
+			installlist="$(estrlist exclude "$(echo "$installlist" | (skip_installed='yes' filter_out_installed_packages))" "$installlist")" #"
 			[ -n "$verbose" ] && info "Packages to upgrade: $installlist"
 			(pkg_names="$installlist" epm_Install)
 			epm_removerepo
@@ -60,7 +60,7 @@ epm_upgrade()
 	aptitude-dpkg)
 		CMD="aptitude dist-upgrade"
 		;;
-	packagekit-*)
+	packagekit)
 		docmd pkcon update
 		return
 		;;

bin/epm-whatdepends

@@ -44,7 +44,7 @@ case $PMTYPE in
 	aptitude-dpkg)
 		CMD="aptitude why"
 		;;
-	packagekit-*)
+	packagekit)
 		CMD="pkcon depends-on"
 		;;
 	yum-rpm)