don't handle ALTServer distro separately

bin/epm-repack-rpm

@@ -101,13 +101,6 @@ EOF
 __epm_repack_to_rpm()
 {
     local pkgs="$*"
-    #case $DISTRNAME in
-    #    ALTLinux|ALTServer)
-    #        ;;
-    #    *)
-    #        assure_distr ALTLinux "install --repack for rpm target"
-    #        ;;
-    #esac
 
     # Note: install epm-repack for static (package based) dependencies
     assure_exists alien || fatal

bin/epm-site

@@ -63,7 +63,7 @@ open_browser()
 __query_package_hl_url()
 {
     case $DISTRNAME in
-        ALTLinux|ALTServer)
+        ALTLinux)
             paoapi srpms/$1 | get_pao_var url
             ;;
     esac

bin/epm-status

@@ -110,7 +110,7 @@ epm_status_original()
     #is_installed $pkg || fatal "FIXME: implemented for installed packages as for now"
 
     case $DISTRNAME in
-        ALTLinux|ALTServer)
+        ALTLinux)
             epm_status_validate $pkg || return 1
             epm_status_repacked $pkg && return 1
 

play.d/angie.sh

@@ -18,7 +18,7 @@ case $(epm print info -e) in
         epm repo addkey angie "https://angie.software/keys/angie-signing.rsa"
         epm repo add "https://download.angie.software/angie/alpine/v$version/main"
         ;;
-    ALTLinux/p10|ALTServer/10|MOS/10|ALTLinux/Sisyphus)
+    ALTLinux/p10|ALTLinux/Sisyphus)
         epm repo addkey angie "https://angie.software/keys/angie-signing.gpg" "EB8EAF3D4EF1B1ECF34865A2617AB978CB849A76" "Angie (Signing Key) <devops@tech.wbsrv.ru>"
         epm repo add "rpm [angie] https://download.angie.software/angie/altlinux/10/ x86_64 main"
         ;;

play.d/gitlab-runner.sh

@@ -26,7 +26,7 @@ esac
 
 repack=''
 case $(epm print info -e) in
-    ALTLinux/*|ALTServer/*)
+    ALTLinux/*)
         repack='--repack'
         ;;
 esac

play.d/ktalk.sh

@@ -8,7 +8,7 @@ DESCRIPTION="Контур.Толк (ktalk) from the official site"
 
 
 case "$(epm print info -d)" in
-    ALTLinux|ALTServer)
+    ALTLinux)
         epm install --skip-installed at-spi2-atk glib2 libalsa libatk libat-spi2-core libcairo libcups libdbus libdbus-glib libdbusmenu libdbusmenu-gtk2 libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+2 libgtk+3 libindicator libpango libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libXrandr
         ;;
 esac

play.d/master-pdf-editor.sh

@@ -17,7 +17,7 @@ case $(epm print info -e) in
     AstraLinuxSE/1.7*|Debian/*|Ubuntu/*)
         PKG="master-pdf-editor-$VERSION-qt5.x86_64.deb"
         ;;
-    RedOS/*|AlterOS/*|ALTLinux/*|ALTServer/*|MOC/*)
+    RedOS/*|AlterOS/*|ALTLinux/*)
         PKG="master-pdf-editor-$VERSION-qt5.x86_64.rpm"
         repack='--repack'
         ;;

play.d/mssql-server.sh

@@ -29,7 +29,7 @@ case "$(epm print info -d)" in
     epm install https://packages.microsoft.com/ubuntu/20.04/mssql-server-2019/pool/main/m/mssql-server/mssql-server_1*_amd64.deb
     epm rr $DEBREPO ; epm update
     ;;
-  ALTLinux|ALTServer)
+  ALTLinux)
     epm install --repack https://packages.microsoft.com/rhel/8/mssql-server-2019/Packages/m/mssql-server-[0-9]*.x86_64.rpm || fatal
     ;;
   Debian|Ubuntu)

play.d/mssql-tools.sh

@@ -22,7 +22,7 @@ case "$(epm print info -d)" in
     #epm install https://packages.microsoft.com/ubuntu/16.04/prod/pool/main/m/mssql-tools/mssql-tools_1*_amd64.deb
     #epm install https://packages.microsoft.com/ubuntu/16.04/prod/pool/main/m/msodbcsql17/msodbcsql17_1*_amd64.deb
     ;;
-  ALTLinux|ALTServer)
+  ALTLinux)
     epm install --skip-installed unixODBC || fatal
     epm install --repack https://packages.microsoft.com/rhel/8/prod/mssql-tools-1*.x86_64.rpm
     epm install --repack https://packages.microsoft.com/rhel/8/prod/msodbcsql17-1*.x86_64.rpm

play.d/okular-csp.sh

@@ -33,7 +33,7 @@ case $(epm print info -e) in
     Fedora/3*|ROSA/2021.1|RedOS/7.3)
         distrib=$vendor
         ;;
-    ALTLinux/p10|ALTServer/10|MOS/10)
+    ALTLinux/p10)
         ;;
     *)
         fatal "Unsupported distro $(epm print info -e). Ask application vendor for a support."

play.d/r7-office-organizer.sh

@@ -28,7 +28,7 @@ case $(epm print info -e) in
     ROSA/2021.1)
         PKGURL="https://download.r7-office.ru/rosa/r7-office-organizer-$VERSION-rosa.ru.x86_64.rpm"
         ;;
-    ALTLinux/*|ALTServer/*)
+    ALTLinux/*)
         PKGURL="https://download.r7-office.ru/altlinux/r7-office-organizer-$VERSION-altlinux.ru.x86_64.rpm"
         ;;
 esac

play.d/r7-office.sh

@@ -21,7 +21,7 @@ case $(epm print info -e) in
     AlterOS/*|CentOS/*)
         PKG="https://download.r7-office.ru/centos/r7-office.rpm"
         ;;
-    ALTLinux/*|ALTServer/*)
+    ALTLinux/*)
         PKG="https://download.r7-office.ru/altlinux/r7-office.rpm"
         epm install --skip-installed fonts-ttf-dejavu fonts-ttf-google-crosextra-carlito fonts-ttf-liberation gst-libav gst-plugins-ugly1.0 libX11 libXScrnSaver libcairo libgcc1 libgtk+2 libgtkglext
         ;;

play.d/rstudio.sh

@@ -27,7 +27,7 @@ case $(epm print info -e) in
     Fedora/*|RHEL/9)
         PKGFILTER="rhel9"
         ;;
-    ALTLinux/*|ALTServer/*)
+    ALTLinux/*)
         PKGFILTER="rhel8"
         repack='--repack'
         ;;

play.d/sputnik-browser.sh

@@ -29,7 +29,7 @@ case "$(epm print info -e)" in
     ALTLinux/c8)
         id_content='alt-id'
         ;;
-    ALTLinux/*|ALTServer/*)
+    ALTLinux/*)
         id_content='alt9-id'
         ;;
     AstraLinux*)

play.d/trueconf.sh

@@ -10,7 +10,7 @@ DESCRIPTION="TrueConf client for Linux from the official site"
 epmopt=''
 distrversion=$(epm print info -v)
 case "$(epm print info -e)" in
-    ALTLinux/p10|ALTServer/10|ALTLinux/Sisyphus)
+    ALTLinux/p10|ALTLinux/Sisyphus)
         URL="https://mirror.trueconf.ru/altlinux/p10/x86_64/RPMS.non-free/trueconf-${VERSION}*.x86_64.rpm"
         # we need repack, they change files in a home dir
         epmopt='--direct --repack'

play.d/whatsapp.sh

@@ -13,11 +13,6 @@ fi
 
 [ "$(epm print info -s)" = "alt" ] && fatal "ALT is not supports $PKGNAME AppImage for now."
 
-#case "$(epm print info -d)" in
-#    ALTLinux|ALTServer)
-#        epm install --skip-installed at-spi2-atk glib2 libalsa libatk libat-spi2-core libcairo libcups libdbus libdbus-glib libdbusmenu libdbusmenu-gtk2 libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+2 libgtk+3 libindicator libpango libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libXrandr
-#        ;;
-#esac
 arch=x86_64
 # sh: symbol lookup error: /tmp/.private/lav/.mount_whatsaxhRMDh/opt/libc/lib/x86_64-linux-gnu/libc.so.6: undefined symbol: __libc_enable_secure, version GLIBC_PRIVATE
 URL=$(epm tool eget --list --latest https://github.com/eneshecan/whatsapp-for-linux/releases "$PKGNAME-$VERSION-$arch.AppImage") || fatal "Can't get package URL"

prescription.d/glibc-restore.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Uninstall etersoft build of glibc" && exit
 
-distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+[ "$(epm print info -s)" = "alt" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
 
 epm downgrade glibc-core glibc-preinstall
 exit 0

prescription.d/glusterfs7.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Install glusterfs7 (or upgrade from glusterfs6)" && exit
 
-distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+[ "$(epm print info -s)" = "alt" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
 
 if epmqp --quiet glusterfs6- ; then
     # Upgrade if was installed

prescription.d/glusterfs8.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Install glusterfs8 (or upgrade from glusterfs7)" && exit
 
-distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+[ "$(epm print info -s)" = "alt" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
 
 GFSOLD=glusterfs7
 GFSNEW=glusterfs8

prescription.d/glusterfs9.sh

@@ -2,7 +2,8 @@
 
 [ "$1" != "--run" ] && echo "Install glusterfs9 (or upgrade from glusterfs8)" && exit
 
-distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+[ "$(epm print info -s)" = "alt" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+
 
 GFSOLD=glusterfs8
 GFSNEW=glusterfs9

prescription.d/python2-remove.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Remove all possible python2 packages" && exit
 
-distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+[ "$(epm print info -s)" = "alt" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
 
 PACKAGES="$(epm qp python-module)"