epm update-kernel --used-kflavour: fix and use

bin/epm-kernel_update

@@ -64,7 +64,7 @@ case $1 in
 
     '--used-kflavour' )
         used_kflavour
-        info 'You used $USED_KFLAVOUR kernel kflavour'
+        [ -n "$verbose" ] && info 'You used $USED_KFLAVOUR kernel kflavour' || echo "$USED_KFLAVOUR"
         return ;;
 
     '--check-run-kernel' )

prescription.d/switch-to-nouveau.sh

@@ -11,13 +11,6 @@ exit
 [ "$(epm print info -s)" = "alt" ] || fatal "Only ALTLinux is supported"
 
 # https://www.altlinux.org/Nvidia#Смена_открытых_драйверов_на_проприетарные[1]
-used_kflavour () {
-    if [ $(uname -r | grep "def") ] ; then
-		USED_KFLAVOUR=$(uname -r | awk -F'-' '{print $2 "-" $3}')
-    else
-		USED_KFLAVOUR=$(uname -r | awk -F'-' '{print $2}')
-    fi
-}
 
 epm update || fatal
 epm update-kernel || fatal
@@ -26,7 +19,8 @@ if ! epm update-kernel --check-run-kernel ; then
     fatal
 fi
 
-used_kflavour
+USED_KFLAVOUR="$(epm update-kernel --used-kflavour)"
+# TODO: fix to use just epmi kernel-modules-drm-nouveau
 epm install --skip-installed kernel-modules-drm-nouveau-$USED_KFLAVOUR xorg-drv-nouveau i586-xorg-drv-nouveau || fatal
 
 echo "Set nouveau in /etc/X11/xorg.conf.d/10-monitor.conf"

prescription.d/waydroid.sh

@@ -32,15 +32,6 @@ Use: epm prescription waydroid [option]
     exit
 }
 
-# TODO: fix used_kflavour export in epm update-kernel --check-run-kernel
-used_kflavour () {
-    if [ $(uname -r | grep "def") ] ; then
-		USED_KFLAVOUR=$(uname -r | awk -F'-' '{print $2 "-" $3}')
-    else
-		USED_KFLAVOUR=$(uname -r | awk -F'-' '{print $2}')
-    fi
-}
-
 waydroid_install () {
 	epm update-kernel --add-kernel-options psi1
 
@@ -51,7 +42,7 @@ waydroid_install () {
 		fatal
 	fi
 
-	used_kflavour
+	USED_KFLAVOUR="$(epm update-kernel --used-kflavour)"
 	epm install --skip-installed kernel-modules-anbox-$USED_KFLAVOUR libgbinder1 waydroid || fatal
 
 	a= update-grub