small fixes

bin/epm

@@ -269,7 +269,7 @@ check_command()
     full-upgrade)              # HELPCMD: update all system packages and kernel
         epm_cmd=full_upgrade
         ;;
-    release-upgrade|upgrade-release|upgrade-system|release-switch)  # HELPCMD: upgrade/switch whole system to the release in arg (default: next (latest) release)
+    release-upgrade|upgrade-release|upgrade-system|release-switch|release-downgrade)  # HELPCMD: upgrade/switch whole system to the release in arg (default: next (latest) release)
         epm_cmd=release_upgrade
         ;;
     kernel-update|kernel-upgrade|update-kernel|upgrade-kernel)      # HELPCMD: update system kernel to the last repo version
@@ -407,7 +407,7 @@ check_option()
         sort="$1"
         ;;
     --auto|--non-interactive)  # HELPOPT: non interactive mode
-        non_interactive=1
+        non_interactive="--auto"
         ;;
     *)
         return 1

bin/epm-play

@@ -111,6 +111,6 @@ if [ "$1" == "--list-all" ] || [ -z "$*" ] ; then
     exit
 fi
 
-__check_installed_app "$1" && info "$1 is already installed" && exit 1
+__check_installed_app "$1" && info "$1 is already installed (use --remove to remove)" && exit 1
 __epm_play_run "$1" --run && __save_installed_app "$1"
 }

bin/epm-repack

@@ -164,6 +164,7 @@ EOF
 # will fill repacked_rpms var
 __epm_repack_to_rpm()
 {
+    local pkgs="$*"
     assure_distr ALTLinux "install --repack"
 
     # install epm-repack for static (package based) dependencies
@@ -172,7 +173,7 @@ __epm_repack_to_rpm()
     assure_exists rpmbuild rpm-build || fatal
 
     # TODO: improve
-    if echo "$*" | grep "\.deb" ; then
+    if echo "$pkgs" | grep "\.deb" ; then
         assure_exists dpkg || fatal
         # TODO: Для установки требует: /usr/share/debconf/confmodule но пакет не может быть установлен
         # assure_exists debconf
@@ -184,9 +185,10 @@ __epm_repack_to_rpm()
 
     local alpkg
     local abspkg
+    local tmpbuilddir
     repacked_rpms=''
-    for pkg in $* ; do
-        local tmpbuilddir=$HOME/$(basename $pkg).tmpdir
+    for pkg in $pkgs ; do
+        tmpbuilddir=$HOME/$(basename $pkg).tmpdir
         mkdir $tmpbuilddir
         abspkg="$(realpath $pkg)"
         info ""

prescription.d/chromium-gost.sh

-#!/bin/sh
+#!/bin/sh -x
 
 # TODO: common place
 fatal()

prescription.d/glusterfs8.sh

@@ -15,7 +15,7 @@ else
     # Install all packages
     epmi ${GFSNEW}-cli ${GFSNEW}-client ${GFSNEW}
 
-    echo "You can install also '${GFSNEW}-server' if needed for this host"
+    echo "You can install also '${GFSNEW}-server' if it is needed for this host"
 
     epme $(epmqp ${GFSOLD})
 fi