Commit e42126bd authored by Vitaly Lipatov's avatar Vitaly Lipatov

distr_info: add DISTRIB_CODENAME

parent 458895f3
...@@ -55,6 +55,7 @@ override_distrib() ...@@ -55,6 +55,7 @@ override_distrib()
DISTRO_NAME="$DISTRIB_ID" DISTRO_NAME="$DISTRIB_ID"
DISTRIB_RELEASE="$(echo "$name" | sed -e 's|.*/||')" DISTRIB_RELEASE="$(echo "$name" | sed -e 's|.*/||')"
[ "$DISTRIB_ID" = "$DISTRIB_RELEASE" ] && DISTRIB_RELEASE='' [ "$DISTRIB_ID" = "$DISTRIB_RELEASE" ] && DISTRIB_RELEASE=''
DISTRIB_CODENAME=''
} }
...@@ -230,6 +231,11 @@ print_codename() ...@@ -230,6 +231,11 @@ print_codename()
echo "$DISTRIB_CODENAME" echo "$DISTRIB_CODENAME"
} }
print_repo_name()
{
echo "$DISTRIB_CODENAME"
}
get_var() get_var()
{ {
# get first variable and print it out, drop quotes if exists # get first variable and print it out, drop quotes if exists
...@@ -364,10 +370,14 @@ esac ...@@ -364,10 +370,14 @@ esac
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
"ALTLinux") "ALTLinux")
echo "$VERSION" | grep -q "c9f.* branch" && DISTRIB_RELEASE="c9" echo "$VERSION" | grep -q "c9.* branch" && DISTRIB_RELEASE="c9"
# FIXME: fast hack for fallback: 10 -> p10 for /etc/os-release DISTRIB_CODENAME="$DISTRIB_RELEASE"
echo "$VERSION" | grep -q "c9f1 branch" && DISTRIB_CODENAME="c9f1"
echo "$VERSION" | grep -q "c9f2 branch" && DISTRIB_CODENAME="c9f2"
# FIXME: fast hack for fallback: 10.1 -> p10 for /etc/os-release
if echo "$DISTRIB_RELEASE" | grep -q "^[0-9]" && echo "$DISTRIB_RELEASE" | grep -q -v "[0-9][0-9][0-9]" ; then if echo "$DISTRIB_RELEASE" | grep -q "^[0-9]" && echo "$DISTRIB_RELEASE" | grep -q -v "[0-9][0-9][0-9]" ; then
DISTRIB_RELEASE="$(echo p$DISTRIB_RELEASE | sed -e 's|\..*||')" DISTRIB_RELEASE="$(echo p$DISTRIB_RELEASE | sed -e 's|\..*||')"
DISTRIB_CODENAME="$DISTRIB_RELEASE"
fi fi
;; ;;
# "ALTServer") # "ALTServer")
...@@ -388,11 +398,13 @@ case "$DISTRIB_ID" in ...@@ -388,11 +398,13 @@ case "$DISTRIB_ID" in
DISTRIB_RELEASE="c9f3" DISTRIB_RELEASE="c9f3"
;; ;;
esac esac
DISTRIB_CODENAME="$DISTRIB_RELEASE"
# DISTRIB_RELEASE=$(echo $DISTRIB_RELEASE | sed -e "s/\..*//g") # DISTRIB_RELEASE=$(echo $DISTRIB_RELEASE | sed -e "s/\..*//g")
;; ;;
"Sisyphus") "Sisyphus")
DISTRIB_ID="ALTLinux" DISTRIB_ID="ALTLinux"
DISTRIB_RELEASE="Sisyphus" DISTRIB_RELEASE="Sisyphus"
DISTRIB_CODENAME="$DISTRIB_RELEASE"
;; ;;
esac esac
...@@ -927,6 +939,9 @@ case "$1" in ...@@ -927,6 +939,9 @@ case "$1" in
-o|--os-name) -o|--os-name)
get_base_os_name get_base_os_name
;; ;;
-r|--repo-name)
print_repo_name
;;
--build-id) --build-id)
echo "$BUILD_ID" echo "$BUILD_ID"
;; ;;
......
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