Skip to content

E
eepm
Commit af1125ca authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

distr_info: use alt vendor instead of altlinux

parent 69014b14
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
bin/distr_info
View file @ af1125ca
...@@ -110,7 +110,6 @@ pkgvendor() ...@@ -110,7 +110,6 @@ pkgvendor()
[ "$DISTRIB_ID" = "openSUSETumbleweed" ] && echo "suse" && return [ "$DISTRIB_ID" = "openSUSETumbleweed" ] && echo "suse" && return
[ "$DISTRIB_ID" = "openSUSELeap" ] && echo "suse" && return [ "$DISTRIB_ID" = "openSUSELeap" ] && echo "suse" && return
if [ -n "$VENDOR_ID" ] ; then if [ -n "$VENDOR_ID" ] ; then
[ "$VENDOR_ID" = "altlinux" ] && echo "alt" && return
echo "$VENDOR_ID" echo "$VENDOR_ID"
return return
fi fi
...@@ -434,7 +433,12 @@ DISTRIB_RELEASE=$(normalize_version2 "$DISTRIB_RELEASE") ...@@ -434,7 +433,12 @@ DISTRIB_RELEASE=$(normalize_version2 "$DISTRIB_RELEASE")
[ -n "$DISTRIB_CODENAME" ] || DISTRIB_CODENAME=$DISTRIB_RELEASE [ -n "$DISTRIB_CODENAME" ] || DISTRIB_CODENAME=$DISTRIB_RELEASE
case "$VENDOR_ID" in case "$VENDOR_ID" in
"alt"|"altlinux") "altlinux")
VENDOR_ID="alt"
esac
case "$VENDOR_ID" in
"alt")
# 2.4.5.99 -> 2 # 2.4.5.99 -> 2
DISTRIB_RELEASE=$(normalize_version1 "$DISTRIB_RELEASE_ORIG") DISTRIB_RELEASE=$(normalize_version1 "$DISTRIB_RELEASE_ORIG")
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
......
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