Skip to content

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

distr_info: fix detection

parent ed0eed33
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
bin/distr_info
View file @ 4b552598
...@@ -22,7 +22,7 @@ distro() ...@@ -22,7 +22,7 @@ distro()
has() has()
{ {
[ -n "$DISTROFILE" ] || exit 1 [ -n "$DISTROFILE" ] || exit 1
grep "$1" "$DISTROFILE" >/dev/null 2>&1 grep "$*" "$DISTROFILE" >/dev/null 2>&1
} }
# Translate DISTRIB_ID to vendor name (like %_vendor does) # Translate DISTRIB_ID to vendor name (like %_vendor does)
...@@ -93,7 +93,6 @@ if distro altlinux-release ; then ...@@ -93,7 +93,6 @@ if distro altlinux-release ; then
elif has "ALT Linux 4.1" ; then DISTRIB_RELEASE="4.1" elif has "ALT Linux 4.1" ; then DISTRIB_RELEASE="4.1"
elif has Walnut ; then DISTRIB_RELEASE="4.0" elif has Walnut ; then DISTRIB_RELEASE="4.0"
elif has 5.0 ; then DISTRIB_RELEASE="5.0" elif has 5.0 ; then DISTRIB_RELEASE="5.0"
elif has Desktop ; then DISTRIB_RELEASE="4.0"
elif has 5.1 ; then DISTRIB_RELEASE="5.1" elif has 5.1 ; then DISTRIB_RELEASE="5.1"
elif has Ziziphora ; then DISTRIB_RELEASE="5.1" elif has Ziziphora ; then DISTRIB_RELEASE="5.1"
elif has "ALT Linux p5" ; then DISTRIB_RELEASE="p5" elif has "ALT Linux p5" ; then DISTRIB_RELEASE="p5"
......
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