Commit 61a1f39e authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm play: use fast extra list implementation

parent 58fb0ebd
...@@ -113,6 +113,11 @@ __epm_play_remove() ...@@ -113,6 +113,11 @@ __epm_play_remove()
} }
__check_product_alt()
{
grep -q -E "^PRODUCTALT=" $psdir/$1.sh
}
__get_fast_short_list_app() __get_fast_short_list_app()
{ {
local arch="$1" local arch="$1"
...@@ -145,8 +150,8 @@ __epm_play_list() ...@@ -145,8 +150,8 @@ __epm_play_list()
if [ -n "$short" ] ; then if [ -n "$short" ] ; then
for i in $(__get_fast_short_list_app $arch) ; do for i in $(__get_fast_short_list_app $arch) ; do
echo "$i" echo "$i"
if [ -n "$extra" ] ; then if [ -n "$extra" ] && __check_product_alt $i ; then
for j in $(__run_script "$i" "--product-alternatives") ; do for j in $(__run_script "$i" "--product-alternatives" </dev/null) ; do
echo " $i=$j" echo " $i=$j"
done done
fi fi
...@@ -161,8 +166,8 @@ __epm_play_list() ...@@ -161,8 +166,8 @@ __epm_play_list()
__get_fast_int_list_app $arch | while IFS=$'\x1E' read -r app desc; do __get_fast_int_list_app $arch | while IFS=$'\x1E' read -r app desc; do
[ -n "$quiet" ] || echo -n " " [ -n "$quiet" ] || echo -n " "
if [ -n "$extra" ] ; then
printf "%-25s - %s\n" "$app" "$desc" printf "%-25s - %s\n" "$app" "$desc"
if [ -n "$extra" ] && __check_product_alt $app ; then
local j local j
for j in $(__run_script "$app" "--product-alternatives" </dev/null) ; do for j in $(__run_script "$app" "--product-alternatives" </dev/null) ; do
printf " %-25s - %s\n" "$app=$j" "$desc" printf " %-25s - %s\n" "$app=$j" "$desc"
......
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