presctiptions: use DISTRVERNDOR instead of distro_info

bin/epm-prescription

@@ -38,6 +38,7 @@ fi
 
 # allow use EGET in the scripts
 __set_EGET
+# also we will have DISTRVENDOR there
 
 export PATH=$PROGDIR:$PATH
 

prescription.d/README.md

+
+Allowed variables:
+* $EGET (wget like utility)
+* $DISTRVENDOR (distro_info utility)
+
+Allowed command:
+* epm (run the same epm called from)
+
+TODO:
+* inject some functions

prescription.d/chrome.sh

@@ -9,10 +9,10 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install The popular and trusted web browser by Google (Stable Channel) from the official site" && exit
 
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
-arch=$(distro_info --distro-arch)
-pkgtype=$(distro_info -p)
+arch=$($DISTRVENDOR --distro-arch)
+pkgtype=$($DISTRVENDOR -p)
 
 # don't used
 complex_get()

prescription.d/chromium-gost.sh

@@ -9,10 +9,10 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install Chromium with GOST support from the official site" && exit
 
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
-#arch=$(distro_info --distro-arch)
-#pkgtype=$(distro_info -p)
+#arch=$($DISTRVENDOR --distro-arch)
+#pkgtype=$($DISTRVENDOR -p)
 arch=amd64
 pkgtype=deb
 

prescription.d/edge.sh

@@ -9,7 +9,7 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install Microsoft Edge browser (dev) from the official site" && exit
 
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
 # epm uses eget to download * names
 epm install "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-*_amd64.deb"

prescription.d/glibc-restore.sh

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

prescription.d/i586-fix.sh

@@ -2,8 +2,8 @@
 
 [ "$1" != "--run" ] && echo "Fix missed 32 bit package modules on 64 bit system" && exit
 
-[ "$(distro_info -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
 LIST=''
 

prescription.d/i586-wine-etersoft.sh

@@ -4,8 +4,8 @@ MAIN=wine-etersoft
 
 [ "$1" != "--run" ] && echo "Install 32 bit $MAIN packages on 64 bit system" && exit
 
-[ "$(distro_info -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
 # Устанавливаем wine
 epmi lib$MAIN i586-$MAIN i586-lib$MAIN i586-lib$MAIN-gl

prescription.d/i586-wine-vanilla.sh

@@ -4,8 +4,8 @@ MAIN=wine-vanilla
 
 [ "$1" != "--run" ] && echo "Install 32 bit $MAIN packages on 64 bit system" && exit
 
-[ "$(distro_info -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
 # Устанавливаем wine
 epmi lib$MAIN i586-$MAIN i586-lib$MAIN i586-lib$MAIN-gl

prescription.d/i586-wine.sh

@@ -4,8 +4,8 @@ MAIN=wine
 
 [ "$1" != "--run" ] && echo "Install 32 bit $MAIN packages on 64 bit system" && exit
 
-[ "$(distro_info -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -d)" != "ALTLinux" ] && echo "Only ALTLinux is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
 # Устанавливаем wine
 epmi lib$MAIN i586-$MAIN i586-lib$MAIN i586-lib$MAIN-gl

prescription.d/php8.sh

+#!/bin/sh
+
+[ "$1" != "--run" ] && echo "Install php8 (or upgrade from php7)" && exit
+
+# TODO: check for apache2-mod_php7
+
+if epmqp --quiet php7- ; then
+    # Upgrade if was installed php5
+    epmqp php7 --short | sed -e "s|php7|php8|" | epmi --auto
+
+    epme php7-libs
+else
+    # Install all packages
+    epmi php8 php8-mbstring php8-pdo php8-curl php8-fileinfo php8-dom php8-exif php8-pdo_mysql php8-mysqli php8-pcntl php8-openssl php8-mcrypt php8-gd2 php8-xmlreader php8-memcached php8-xsl php8-zip php8-redis php8-opcache
+    echo "Think twice about php8-imagick. See https://bugzilla.altlinux.org/show_bug.cgi?id=39033"
+fi

prescription.d/skype.sh

@@ -9,10 +9,10 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install Skype for Linux - Stable/Release Version from the official site" && exit
 
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
-#arch=$(distro_info --distro-arch)
-pkgtype=$(distro_info -p)
+#arch=$($DISTRVENDOR --distro-arch)
+pkgtype=$($DISTRVENDOR -p)
 
 # don't used
 complex_get()

prescription.d/teams.sh

@@ -9,10 +9,10 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install Microsoft Teams for Linux from the official site" && exit
 
-[ "$(distro_info -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
+[ "$($DISTRVENDOR -a)" != "x86_64" ] && echo "Only x86_64 is supported" && exit 1
 
 # rpm and deb contains the same binaries
 #https://packages.microsoft.com/yumrepos/ms-teams/teams-1.3.00.25560-1.x86_64.rpm
 
 # epm uses eget to download * names
-epm --noscripts install "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_*_amd64.deb"
+epm --noscripts install "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/$(epm print constructname teams "*" amd64 deb)"

prescription.d/teamviewer.sh

@@ -11,7 +11,7 @@ fatal()
 
 PKGNAME="teamviewer"
 
-arch="$(distro_info -a)"
+arch="$($DISTRVENDOR -a)"
 case "$arch" in
     x86_64|x86)
         ;;

prescription.d/vivaldi.sh

@@ -9,7 +9,7 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install Vivaldi browser from the official site" && exit
 
-arch="$(distro_info --debian-arch)"
+arch="$($DISTRVENDOR --debian-arch)"
 case "$arch" in
     amd64|i386|armhf)
         ;;

prescription.d/zoom.sh

@@ -9,20 +9,20 @@ fatal()
 
 [ "$1" != "--run" ] && echo "Install Zoom client from the official site" && exit
 
-arch=$(distro_info --distro-arch)
+arch=$($DISTRVENDOR --distro-arch)
 case $arch in
     x86_64|amd64)
         arch=$arch ;;
     i586|i386)
         arch=$arch ;;
     *)
-        fatal "Unsupported arch $arch for $(distro_info -d)"
+        fatal "Unsupported arch $arch for $($DISTRVENDOR -d)"
 esac
 
-if [ "$(distro_info -d)" = "ALTLinux" ] ; then
+if [ "$($DISTRVENDOR -d)" = "ALTLinux" ] ; then
     epm install https://zoom.us/client/latest/zoom_$arch.rpm
     exit
 fi
 
 # TODO: there are more complex distro dependent url
-epm --noscripts install "https://zoom.us/client/latest/zoom_$arch.$(distro_info -p)"
+epm --noscripts install "https://zoom.us/client/latest/zoom_$arch.$($DISTRVENDOR -p)"