epm repack: use epm print info instead of $DISTRVENDOR

prescription.d/README.md

 
-Allowed variables:
-* $EGET (wget like utility)
-* $DISTRVENDOR (distro_info utility)
-
 Allowed command:
 * epm (run the same epm called from)

prescription.d/glibc-restore.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Uninstall etersoft build of glibc" && exit
 
-distro="$($DISTRVENDOR -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { 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="$($DISTRVENDOR -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { 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="$($DISTRVENDOR -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
+distro="$(epm print info -d)" ; [ "$distro" = "ALTLinux" ] || [ "$distro" = "ALTServer" ] || { echo "Only ALTLinux is supported" ; exit 1 ; }
 
 GFSOLD=glusterfs7
 GFSNEW=glusterfs8

prescription.d/glusterfs9.sh

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

prescription.d/i586-remove.sh

@@ -2,16 +2,19 @@
 
 [ "$1" != "--run" ] && echo "Remove all 32 bit packages from 64 bit system" && exit
 
-[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$(epm print info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
-case "$($DISTRVENDOR -s)" in
+case "$(epm print info -s)" in
     alt)
         epm --verbose --simulate remove $(epmqp "^i586-")
         ;;
     ubuntu|debian)
         epm --verbose --simulate remove $(epmqp "^i386-")
         ;;
+    fedora|centos|redos)
+        epm --verbose --simulate remove $(epmqp "\.i686$")
+        ;;
     *)
-        fatal "unsupported vendor $($DISTRVENDOR -s)"
+        fatal "unsupported vendor $(epm print info -s)"
         ;;
 esac

prescription.d/php7.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Install php7 (or upgrade from php5)" && exit
 
-distrbase="$($DISTRVENDOR -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
+distrbase="$(epm print info -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
 
 if epmqp --quiet php5- ; then
     # Upgrade all installed php5

prescription.d/php8.0.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Install php8.1 (or upgrade from a previous version)" && exit
 
-distrbase="$($DISTRVENDOR -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
+distrbase="$(epm print info -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
 
 if epmqp --quiet php7- ; then
     # Upgrade all installed php7

prescription.d/php8.1.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Install php8.1 (or upgrade from a previous version)" && exit
 
-distrbase="$($DISTRVENDOR -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
+distrbase="$(epm print info -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
 
 if epmqp --quiet php7- ; then
     # Upgrade all installed php7

prescription.d/php8.2.sh

@@ -2,7 +2,7 @@
 
 [ "$1" != "--run" ] && echo "Install php8.2 (or upgrade from a previous version)" && exit
 
-distrbase="$($DISTRVENDOR -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
+distrbase="$(epm print info -s)" ; [ "$distrbase" = "alt" ] || { echo "Only ALTLinux is supported as for now" ; exit 1 ; }
 
 # TODO: check for apache2-mod_php7
 

prescription.d/python2-remove.sh

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

prescription.d/wine.sh

@@ -2,8 +2,8 @@
 
 MAIN=wine
 
-vendor="$($DISTRVENDOR -s)" ; [ "$vendor" = "alt" ] || { echo "Only ALT distros is supported for now" ; exit 1 ; }
-arch="$($DISTRVENDOR -a)"
+vendor="$(epm print info -s)" ; [ "$vendor" = "alt" ] || { echo "Only ALT distros is supported for now" ; exit 1 ; }
+arch="$(epm print info -a)"
 
 PKGCOMMON="wine-mono wine-gecko winetricks"