add aptitude support

bin/epm-addrepo

@@ -24,7 +24,7 @@ case $PMTYPE in
 		assure_exists apt-repo
 		sudocmd apt-repo add $pkg_filenames
 		;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		echo "You need manually add repo to /etc/apt/sources.list"
 		;;
 	yum-rpm)

bin/epm-autoremove

@@ -45,7 +45,7 @@ case $PMTYPE in
 		# ALT Linux only
 		sudocmd remove-old-kernels
 		;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		sudocmd apt-get autoremove
 		;;
 	aura)

bin/epm-changelog

@@ -53,7 +53,7 @@ __epm_changelog_local_names()
 		apt-rpm|yum-rpm|urpm-rpm|zypper-rpm)
 			docmd_foreach "rpm --changelog" $@ | less
 			;;
-		apt-dpkg)
+		apt-dpkg|aptitude-dpkg)
 			docmd zcat /usr/share/doc/$1/changelog.Debian.gz | less
 			;;
 		emerge)

bin/epm-check

@@ -31,6 +31,10 @@ case $PMTYPE in
 		sudocmd apt-get -f install || exit
 		sudocmd apt-get autoremove
 		;;
+	aptitude-dpkg)
+		sudocmd aptitude -f install || exit
+		#sudocmd apt-get autoremove
+		;;
 	yum-rpm)
 		docmd yum check
 		docmd package-cleanup --problems

bin/epm-clean

 #!/bin/sh
 #
-# Copyright (C) 2012  Etersoft
-# Copyright (C) 2012  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012,2014  Etersoft
+# Copyright (C) 2012,2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -23,6 +23,9 @@ case $PMTYPE in
 	apt-rpm|apt-dpkg)
 		sudocmd apt-get clean
 		;;
+	aptitude-dpkg)
+		sudocmd aptitude clean
+		;;
 	yum-rpm)
 		sudocmd yum clean all
 		#sudocmd yum makecache

bin/epm-conflicts

@@ -77,6 +77,11 @@ case $PMTYPE in
 			return
 		fi
 		;;
+	# TODO: why-not show who conflicts with us
+	#aptitude-dpkg)
+	#	docmd aptitude why-not $pkg_names
+	#	;;
+
 	#emerge)
 	#	assure_exists equery
 	#	CMD="equery depgraph"

bin/epm-filelist

 #!/bin/sh
 #
-# Copyright (C) 2012-2013  Etersoft
-# Copyright (C) 2012-2013  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012-2014  Etersoft
+# Copyright (C) 2012-2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -91,7 +91,7 @@ __epm_filelist_name()
 		apt-rpm)
 			CMD="rpm -ql"
 			;;
-		apt-dpkg)
+		*-dpkg)
 			CMD="dpkg -L"
 			;;
 		yum-rpm)

bin/epm-info

 #!/bin/sh
 #
-# Copyright (C) 2012  Etersoft
-# Copyright (C) 2012  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012,2014  Etersoft
+# Copyright (C) 2012,2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -45,6 +45,13 @@ case $PMTYPE in
 		is_installed $pkg_names && docmd dpkg -p $pkg_names && return
 		docmd apt-cache show $pkg_names
 		;;
+	aptitude-dpkg)
+		if [ -n "$pkg_files" ] ; then
+			docmd dpkg -I $pkg_files
+		fi
+		[ -z "$pkg_names" ] && return
+		docmd aptitude show $pkg_names
+		;;
 	yum-rpm)
 		__epm_info_rpm_low && return
 		docmd yum info $pkg_names

bin/epm-install

@@ -93,6 +93,9 @@ epm_install_names()
 		apt-rpm|apt-dpkg)
 			sudocmd apt-get $APTOPTIONS install $@
 			return ;;
+		aptitude-dpkg)
+			sudocmd aptitude install $@
+			return ;;
 		deepsolver-rpm)
 			sudocmd ds-install $@
 			return ;;
@@ -134,6 +137,7 @@ epm_install_names()
 			__separate_sudocmd_foreach "/usr/sbin/slackpkg install" "/usr/sbin/slackpkg upgrade" $@
 			return ;;
 		homebrew)
+			# FIXME: sudo and quote
 			__separate_sudocmd "brew install" "brew upgrade" $@
 			return ;;
 		ipkg)
@@ -164,6 +168,9 @@ epm_ni_install_names()
 			export DEBIAN_FRONTEND=noninteractive
 			sudocmd apt-get -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" $APTOPTIONS install $@
 			return ;;
+		aptitude-dpkg)
+			sudocmd aptitde -y install $@
+			return ;;
 		yum-rpm)
 			sudocmd yum -y $YUMOPTIONS install $@
 			return ;;
@@ -235,7 +242,7 @@ epm_install_files()
 
             # use install_names
             ;;
-        apt-dpkg)
+        apt-dpkg|aptitude-dpkg)
             # the new version of the conf. file is installed with a .dpkg-dist suffix
             if [ -n "$non_interactive" ] ; then
                 DPKGOPTIONS="--force-confdef --force-confold"
@@ -322,7 +329,7 @@ epm_print_install_command()
         apt-rpm|yum-rpm|urpm-rpm|zypper-rpm|dnf-rpm)
             echo "rpm -Uvh --force $nodeps $@"
             ;;
-        apt-dpkg)
+        apt-dpkg|aptitude-dpkg)
             echo "dpkg -i $@"
             ;;
         pkgsrc)

bin/epm-packages

@@ -43,7 +43,7 @@ case $PMTYPE in
 		CMD="rpm -qa $pkg_filenames"
 		[ -n "$short" ] && CMD="rpm -qa --queryformat %{name}\n $pkg_filenames"
 		;;
-	apt-dpkg)
+	*-dpkg)
 		#CMD="dpkg -l $pkg_filenames"
 		CMD="dpkg-query -W --showformat=\${Package}-\${Version}\n $pkg_filenames"
 		[ -n "$short" ] && CMD="dpkg-query -W --showformat=\${Package}\n $pkg_filenames"

bin/epm-query

@@ -107,7 +107,7 @@ __epm_query_file()
 			CMD="rpm -qp"
 			[ -n "$short" ] && CMD="rpm -qp --queryformat %{name}\n"
 			;;
-		apt-dpkg)
+		*-dpkg)
 			CMD="dpkg-deb --show --showformat=\${Package}-\${Version}\n"
 			[ -n "$short" ] && CMD="dpkg-query --show --showformat=\${Package}\n"
 			;;
@@ -130,7 +130,7 @@ __epm_query_name()
 			CMD="rpm -q"
 			[ -n "$short" ] && CMD="rpm -q --queryformat %{name}\n"
 			;;
-		apt-dpkg)
+		*-dpkg)
 			#docmd dpkg -l $@ | grep "^ii"
 			CMD="dpkg-query -W --showformat=\${Package}-\${Version}\n"
 			[ -n "$short" ] && CMD="dpkg-query -W --showformat=\${Package}\n"

bin/epm-query_file

@@ -68,7 +68,7 @@ __do_query()
         apt-rpm)
             CMD="rpm -qf"
             ;;
-        apt-dpkg)
+        *-dpkg)
             showcmd dpkg -S $1
             dpkg_print_name_version $(dpkg -S $1 | grep -v "^diversion by" | sed -e "s|:.*||")
             return ;;

bin/epm-reinstall

 #!/bin/sh
 #
-# Copyright (C) 2012  Etersoft
-# Copyright (C) 2012  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012,2014  Etersoft
+# Copyright (C) 2012,2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -27,6 +27,9 @@ epm_reinstall_names()
 		apt-rpm|apt-dpkg)
 			sudocmd apt-get --reinstall install $@
 			return ;;
+		aptitude-dpkg)
+			sudocmd aptitude reinstall $@
+			return ;;
 		dnf-rpm)
 			sudocmd dnf reinstall $@
 			return ;;
@@ -48,7 +51,7 @@ epm_reinstall_files()
             sudocmd rpm -Uvh --force $@ && return
             sudocmd apt-get --reinstall install $@
             return ;;
-        apt-pkg)
+        apt-dpkg|aptitude-dpkg)
             sudocmd dpkg -i $@
             return ;;
         slackpkg)

bin/epm-release-upgrade

@@ -30,7 +30,7 @@ epm_release_upgrade()
 		docmd epm Upgrade
 		docmd epm update-kernel
 		;;
-	apt-dpkg)
+	*-dpkg)
 		sudocmd do-release-upgrade -d
 		;;
 	yum-rpm)

bin/epm-remove

 #!/bin/sh
 #
-# Copyright (C) 2012, 2013  Etersoft
-# Copyright (C) 2012, 2013  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012-2014  Etersoft
+# Copyright (C) 2012-2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -27,7 +27,7 @@ epm_remove_low()
 		apt-rpm|yum-rpm|zypper-rpm|urpm-rpm|dnf-rpm)
 			sudocmd rpm -ev $nodeps $@
 			return ;;
-		apt-dpkg)
+		apt-dpkg|aptitude-dpkg)
 			sudocmd dpkg -P $(subst_option nodeps --force-all) $@
 			return ;;
 		pkgsrc)
@@ -54,6 +54,9 @@ epm_remove_names()
 		apt-dpkg)
 			sudocmd apt-get remove --purge $@
 			return ;;
+		aptitude-dpkg)
+			sudocmd aptitude purge $@
+			return ;;
 		apt-rpm)
 			sudocmd apt-get remove $@
 			return ;;
@@ -125,6 +128,9 @@ epm_remove_nonint()
 		apt-dpkg)
 			sudocmd apt-get -y --force-yes remove --purge $@
 			return ;;
+		aptitude-dpkg)
+			sudocmd aptitude -y purge $@
+			return ;;
 		apt-rpm)
 			sudocmd apt-get -y --force-yes remove $@
 			return ;;
@@ -156,7 +162,7 @@ epm_print_remove_command()
 		apt-rpm|yum-rpm|zypper-rpm|urpm-rpm|dnf-rpm)
 			echo "rpm -ev $nodeps $@"
 			;;
-		apt-dpkg)
+		apt-dpkg|aptitude-dpkg)
 			echo "dpkg -P $@"
 			;;
 		pkgsrc)

bin/epm-removerepo

@@ -24,7 +24,7 @@ case $PMTYPE in
 		assure_exists apt-repo
 		sudocmd apt-repo rm $pkg_filenames
 		;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		echo "You need remove repo from /etc/apt/sources.list"
 		;;
 	yum-rpm)

bin/epm-repolist

@@ -38,7 +38,7 @@ case $PMTYPE in
 	deepsolver-rpm)
 		docmd ds-conf
 		;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		showcmd cat /etc/apt/sources.list*
 		print_apt_sources_list /etc/apt/sources.list /etc/apt/sources.list.d/*.list
 		;;

bin/epm-requires

@@ -66,7 +66,7 @@ case $PMTYPE in
 	pacman)
 		CMD="pactree"
 		;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		# FIXME: need fix for a few names case
 		if is_installed $pkg_names ; then
 			showcmd dpkg -s $pkg_names

bin/epm-search

 #!/bin/sh
 #
-# Copyright (C) 2012  Etersoft
-# Copyright (C) 2012  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012,2013  Etersoft
+# Copyright (C) 2012,2013  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -25,6 +25,12 @@ case $PMTYPE in
 	apt-rpm|apt-dpkg)
 		CMD="apt-cache search --"
 		;;
+	aptitude-dpkg)
+		CMD="aptitude search --"
+		;;
+	deepsolver-rpm)
+		CMD="ds-require --"
+		;;
 	urpm-rpm)
 		# urpmq does not support --
 		CMD="urpmq -y"

bin/epm-search_file

@@ -49,7 +49,7 @@ case $PMTYPE in
 	apt-rpm)
 		local_content_search $pkg_filenames
 		return ;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		assure_exists apt-file
 		sudocmd apt-file update
 		docmd apt-file search $pkg_filenames

bin/epm-sh-functions

@@ -347,6 +347,7 @@ case $DISTRNAME in
 		;;
 	Ubuntu|Debian|Mint)
 		CMD="apt-dpkg"
+		#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
 		;;
 	Mandriva|ROSA)
 		CMD="urpm-rpm"

bin/epm-simulate

 #!/bin/sh
 #
-# Copyright (C) 2012-2013  Etersoft
-# Copyright (C) 2012-2013  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012-2014  Etersoft
+# Copyright (C) 2012-2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -62,6 +62,9 @@ _epm_do_simulate()
     	apt-rpm|apt-dpkg)
     		CMD="apt-get --simulate install"
     		;;
+    	aptitude-dpkg)
+    		CMD="aptitude -s install"
+    		;;
     	yum-rpm)
     		if __use_yum_assumeno ; then
     			LC_ALL=C store_output sudocmd yum --assumeno install $filenames

bin/epm-update

 #!/bin/sh
 #
-# Copyright (C) 2012  Etersoft
-# Copyright (C) 2012  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012,2014  Etersoft
+# Copyright (C) 2012,2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -33,6 +33,9 @@ case $PMTYPE in
 		#sudocmd apt-get -f install || exit
 		#sudocmd apt-get autoremove
 		;;
+	aptitude-dpkg)
+		sudocmd aptitude update || exit
+		;;
 	yum-rpm)
 		sudocmd yum check-update
 		;;

bin/epm-upgrade

 #!/bin/sh
 #
-# Copyright (C) 2012  Etersoft
-# Copyright (C) 2012  Vitaly Lipatov <lav@etersoft.ru>
+# Copyright (C) 2012,2014  Etersoft
+# Copyright (C) 2012,2014  Vitaly Lipatov <lav@etersoft.ru>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -28,6 +28,9 @@ epm_upgrade()
 		# Функцию добавления параметра при условии
 		CMD="apt-get dist-upgrade"
 		;;
+	aptitude-dpkg)
+		CMD="aptitude dist-upgrade"
+		;;
 	yum-rpm)
 		# can do update repobase automagically
 		CMD="yum update"

bin/epm-whatdepends

@@ -27,9 +27,12 @@ case $PMTYPE in
 	apt-rpm)
 		CMD="apt-cache whatdepends"
 		;;
-	apt-dpkg)
+	apt-dpkg|aptitude-dpkg)
 		CMD="apt-cache rdepends"
 		;;
+	aptitude-dpkg)
+		CMD="aptitude why"
+		;;
 	yum-rpm)
 		CMD="repoquery --whatrequires"
 		;;

bin/epm-whatprovides

@@ -27,7 +27,7 @@ case $PMTYPE in
 	conary)
 		CMD="conary repquery --what-provides"
 		;;
-	apt-rpm|apt-dpkg)
+	apt-rpm|apt-dpkg|aptitude-dpkg)
 		LANG=C docmd apt-get install --print-uris $pkg_filenames | grep "^Selecting" | cut -f2 -d" "
 		return
 		;;