Commit 82bc6dd8 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm assure: add AUR fallback for Arch Linux, remove assure_exist_arch

parent f8536410
...@@ -102,7 +102,14 @@ epm_assure() ...@@ -102,7 +102,14 @@ epm_assure()
# can't be used in epm ei case # can't be used in epm ei case
#docmd epm --auto install $PACKAGE || return #docmd epm --auto install $PACKAGE || return
load_helper epm-install load_helper epm-install
(repack='' pkg_names="$PACKAGE" pkg_files='' pkg_urls='' epm_install ) || return if ! (repack='' pkg_names="$PACKAGE" pkg_files='' pkg_urls='' epm_install ) ; then
# Try AUR for Arch Linux
if [ "$PMTYPE" = "pacman" ] ; then
(repack='' pkg_names="aur/$PACKAGE" pkg_files='' pkg_urls='' epm_install ) || return
else
return 1
fi
fi
# keep auto installed packages # keep auto installed packages
# https://bugzilla.altlinux.org/42240 # https://bugzilla.altlinux.org/42240
......
...@@ -41,7 +41,7 @@ __epm_repack_to_arch() ...@@ -41,7 +41,7 @@ __epm_repack_to_arch()
{ {
local pkg="$1" local pkg="$1"
assure_exist_arch debtap assure_exists debtap
repacked_pkg='' repacked_pkg=''
......
...@@ -831,19 +831,6 @@ assure_exists() ...@@ -831,19 +831,6 @@ assure_exists()
} }
# Assure that an Arch Linux package exists, installing it if necessary
# Args: command name
assure_exist_arch()
{
local cmd="$1"
if ! is_command "$cmd" ; then
info "$cmd utility not found, attempting to install it..."
docmd epm install "$cmd" || docmd epm install "aur/$cmd"
fi
}
assure_exists_erc() assure_exists_erc()
{ {
load_helper epm-assure load_helper epm-assure
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment