small fixes

bin/epm-download

@@ -19,11 +19,17 @@
 
 __use_url_install()
 {
-	case $PMTYPE in
-		apt-rpm)
-			# ALT Linux really?
+	case $DISTRNAME in
+		"ALTLinux")
 			pkg_names="$pkg_names $pkg_urls"
+			return 0
 			;;
+	esac
+
+	case $PMTYPE in
+		#apt-rpm)
+		#	pkg_names="$pkg_names $pkg_urls"
+		#	;;
 		#deepsolver-rpm)
 		#	pkg_names="$pkg_names $pkg_urls"
 		#	;;
@@ -54,7 +60,7 @@ __download_pkg_urls()
 	for url in $pkg_urls ; do
 		# TODO: use some individual tmp dir
 		local new_file=/tmp/$(basename "$url")
-		if eget -O $new_file $url && [ -s "$new_file" ] ; then
+		if docmd eget -O $new_file $url && [ -s "$new_file" ] ; then
 			pkg_files="$pkg_files $new_file"
 			to_remove_pkg_files="$to_remove_pkg_files $new_file"
 		else
@@ -70,8 +76,8 @@ __handle_pkg_urls_to_install()
 
 	# TODO: do it correctly
 	to_remove_pkg_files=
-	
-	if [ "$(get_package_type "$pkg")" != $PKGFORMAT ] || ! __use_url_install ; then
+	# FIXME: check type of pkg_urls separately?
+	if [ "$(get_package_type "$pkg_urls")" != $PKGFORMAT ] || ! __use_url_install ; then
 		# use workaround with eget: download and put in pkg_files
 		__download_pkg_urls
 	fi

bin/epm-search_file

@@ -22,6 +22,7 @@ __alt_local_content_search()
     load_helper epm-sh-altlinux
 
     local CI="$(get_local_alt_contents_index)"
+    # TODO use something like
     [ -n "$CI" ] || fatal "Have no local contents index"
     #local OUTCMD="less"
     #[ -n "$USETTY" ] || OUTCMD="cat"