Commit 0fb00cdd authored by Vitaly Lipatov's avatar Vitaly Lipatov

small fixes

parent bec5cfba
...@@ -45,9 +45,16 @@ fi ...@@ -45,9 +45,16 @@ fi
distrib=$(epm print info --codename) distrib=$(epm print info --codename)
pkgsystem=$(epm print info -g)
case $(epm print info -e) in case $(epm print info -e) in
# TODO: # TODO:
AstraLinux/orel)
pkgsystem=''
epm repo addkey "$REPOURL/lab50.gpg"
epm repo add "deb $REPOURL/ce stable main"
;;
# TODO:
# AstraLinuxSE/1.7*) # AstraLinuxSE/1.7*)
AstraLinux/smolensk) AstraLinux/smolensk)
distrib=alse17 distrib=alse17
...@@ -60,7 +67,7 @@ case $(epm print info -e) in ...@@ -60,7 +67,7 @@ case $(epm print info -e) in
;; ;;
esac esac
case $(epm print info -g) in case $pkgsystem in
apt-dpkg) apt-dpkg)
epm repo addkey "$REPOURL/lab50.gpg" epm repo addkey "$REPOURL/lab50.gpg"
epm repo add "deb $REPOURL/okular $distrib main" epm repo add "deb $REPOURL/okular $distrib main"
......
...@@ -7,7 +7,7 @@ fatal() ...@@ -7,7 +7,7 @@ fatal()
exit 1 exit 1
} }
LOGDIR=~ [ -n "$LOGDIR" ] || LOGDIR=~
TDIR=$LOGDIR/epm-play-versions TDIR=$LOGDIR/epm-play-versions
EDIR=$LOGDIR/epm-errors EDIR=$LOGDIR/epm-errors
LDIR=$LOGDIR/epm-logs LDIR=$LOGDIR/epm-logs
...@@ -41,6 +41,7 @@ install_app_alt() ...@@ -41,6 +41,7 @@ install_app_alt()
{ {
local app="$1" local app="$1"
local productalt="$($EPM play --product-alternatives $app)" local productalt="$($EPM play --product-alternatives $app)"
local distr="$($EPM print info -s)"
if [ -z "$productalt" ] ; then if [ -z "$productalt" ] ; then
install_app $app install_app $app
...@@ -49,6 +50,8 @@ install_app_alt() ...@@ -49,6 +50,8 @@ install_app_alt()
# оставляем дефолтный вариант в конце в системе # оставляем дефолтный вариант в конце в системе
for i in $productalt "" ; do for i in $productalt "" ; do
# hack for broken gitlab-runner
[ "$distr" != "alt" ] && [ "$i" = "gitlab-runner" ] && continue
$EPM play --remove --auto $app $EPM play --remove --auto $app
install_app $app $i install_app $app $i
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment