Commit 14b9d9cb authored by Vitaly Lipatov's avatar Vitaly Lipatov

introduce RELEASEPREFIX and use it

parent 3f3cadcf
...@@ -83,7 +83,7 @@ get_altdistr_mod() ...@@ -83,7 +83,7 @@ get_altdistr_mod()
# Проверяем, соответствует ли релиз пакетов указанному в MENV # Проверяем, соответствует ли релиз пакетов указанному в MENV
function pkg_release_check() function pkg_release_check()
{ {
local STREL=alt local STREL=$RELEASEPREFIX
[ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE [ -z "$KORINFTARGETRELEASE" ] || STREL=$KORINFTARGETRELEASE
if [ "$MENV" = "SS" ] || [ "$MENV" = "DD" ] ; then if [ "$MENV" = "SS" ] || [ "$MENV" = "DD" ] ; then
......
...@@ -52,6 +52,7 @@ MENV=SS ...@@ -52,6 +52,7 @@ MENV=SS
[ -n "$DEBUG" ] && HASHERARG="-v $HASHERARG" [ -n "$DEBUG" ] && HASHERARG="-v $HASHERARG"
#SSH_KEYFILE=~/.ssh/id_dsa #SSH_KEYFILE=~/.ssh/id_dsa
RELEASEPREFIX=alt
GIRARHOST=git.alt GIRARHOST=git.alt
GIRARURL="http://git.altlinux.org" GIRARURL="http://git.altlinux.org"
......
...@@ -38,7 +38,7 @@ get_numrelease() ...@@ -38,7 +38,7 @@ get_numrelease()
# get alt from alt11 # get alt from alt11
get_txtrelease() get_txtrelease()
{ {
get_release "$1" | sed -e "s|\([a-zA-Z]*\)\([0-9\.]\).*|\1|" || echo "alt" get_release "$1" | sed -e "s|\([a-zA-Z]*\)\([0-9\.]\).*|\1|" || echo "$RELEASEPREFIX"
} }
set_var() set_var()
...@@ -49,9 +49,7 @@ set_var() ...@@ -49,9 +49,7 @@ set_var()
set_release() set_release()
{ {
local RELEASE=$2 local RELEASE=$2
if [ -z "$RELEASE" ] ; then [ -n "$RELEASE" ] || RELEASE="${RELEASEPREFIX}1"
RELEASE=alt1
fi
set_var $1 Release $RELEASE set_var $1 Release $RELEASE
} }
......
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