Commit 9ca1a6c0 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.64.58

parent 42fbe625
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.64.57" EPMVERSION="3.64.58"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -1214,13 +1214,26 @@ set_pm_type() ...@@ -1214,13 +1214,26 @@ set_pm_type()
if [ -n "$EPM_BACKEND" ] ; then if [ -n "$EPM_BACKEND" ] ; then
PMTYPE="$EPM_BACKEND" PMTYPE="$EPM_BACKEND"
return
fi fi
if [ -n "$FORCEPM" ] ; then if [ -n "$FORCEPM" ] ; then
PMTYPE="$FORCEPM" PMTYPE="$FORCEPM"
return
fi fi
case "$PMTYPE" in
dnf5)
PMTYPE="dnf5-rpm"
;;
esac
case "$PMTYPE" in
dnf5-rpm)
DNFCMD="dnf5"
;;
dnf-rpm)
DNFCMD="dnf"
;;
esac
} }
is_active_systemd() is_active_systemd()
...@@ -1391,7 +1404,7 @@ __epm_suggest_similar_packages() ...@@ -1391,7 +1404,7 @@ __epm_suggest_similar_packages()
is_command fzf || return 1 is_command fzf || return 1
local similar local similar
similar="$(fzf -f "$pkg" < "$cache" 2>/dev/null | head -$count)" similar="$(fzf -f "$pkg" < "$cache" 2>/dev/null | grep -v "^${pkg}$" | head -$count)"
[ -z "$similar" ] && return 1 [ -z "$similar" ] && return 1
# Interactive selection if enabled (via config or --interactive flag) # Interactive selection if enabled (via config or --interactive flag)
......
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