epm play okular-sp: some improvements

play.d/okular-csp.sh

@@ -21,16 +21,19 @@ esac
 # https://okulargost.ru/info.html
 # http://packages.lab50.net/okular/install
 
+distrib=$(epm print info --repo-name)
+vendor=$(epm print info -s)
 
 # Strict supported list
 case $(epm print info -e) in
-    Debian/11|Ubuntu/20.04)
+    Debian/1*|Ubuntu/20.04)
         ;;
     AstraLinuxSE/1.7*)
         ;;
-    Fedora/35|ROSA/2021|RedOS/7)
+    Fedora/3*|ROSA/2021.1|RedOS/7.3)
+        distrib=$vendor
         ;;
-    ALTLinux/p10|ALTServer/10)
+    ALTLinux/p10|ALTServer/10|MOS/10)
         ;;
     *)
         fatal "Unsupported distro $(epm print info -e). Ask application vendor for a support."
@@ -39,13 +42,15 @@ esac
 
 
 # CryptoPro needed for install
-if ! epmqp "cprocsp-" >/dev/null ; then
+if ! epm qp "cprocsp-" >/dev/null ; then
     # TODO: install ecryptomgr here and check ecryptomgr status cryptopro
     fatal "Install CryptoPro before (install ecryptomgr package and check https://github.com/Etersoft/ecryptomgr )"
+# TODO: check:
+# $ tar -xf linux-amd64_deb.tgz -C /tmp
+# $ sudo /tmp/linux-amd64_deb/install.sh cprocsp-rdr-gui-gtk
 fi
 
 
-distrib=$(epm print info --codename)
 pkgsystem=$(epm print info -g)
 
 case $(epm print info -e) in
@@ -60,7 +65,10 @@ case $(epm print info -e) in
         distrib=alse17
         additional_packages="libkf5js5=5.78.0-0ubuntu2+alse17 libkf5jsapi5=5.78.0-0ubuntu2+alse17"
         ;;
-    ALTLinux*|ALTServer*)
+esac
+
+case $vendor in
+    alt)
 # TODO get key info from gpg file
         epm repo addkey "$REPOURL/lab50.gpg" "D0C721136AFF9319DCF8276EA98DF0BE319FACDA" "Laboratory 50 (APT Archive Key) <team@lab50.net>"
         epm repo add "rpm [lab50] $REPOURL/okular/alt x86_64 p10"
@@ -70,7 +78,7 @@ esac
 case $pkgsystem in
     apt-dpkg)
         epm repo addkey "$REPOURL/lab50.gpg"
-        epm repo add "deb $REPOURL/okular $distrib main"
+        epm repo add "deb $REPOURL/okular $distrib main non-free"
         ;;
     dnf-rpm)
         epm repo add "$REPOURL/okular/$distrib/okularcsp.repo"