Commit 179b1d3f authored by Vitaly Lipatov's avatar Vitaly Lipatov

- set Generic DISTRIB_ID after all

- fix c9f1 detection again
parent 41fa32f6
......@@ -196,7 +196,7 @@ normalize_name()
# Default values
PRETTY_NAME=""
DISTRIB_ID="Generic"
DISTRIB_ID=""
DISTRIB_RELEASE=""
DISTRIB_CODENAME=""
......@@ -235,7 +235,6 @@ if distro altlinux-release ; then
elif has "ALT c8 " ; then DISTRIB_RELEASE="c8"
elif has "ALT c8.1 " ; then DISTRIB_RELEASE="c8.1"
elif has "ALT c8.2 " ; then DISTRIB_RELEASE="c8.2"
elif has "ALT .*9.[0-9]" ; then DISTRIB_RELEASE="p9"
elif has "ALT .*8.[0-9]" ; then DISTRIB_RELEASE="p8"
elif has "ALT c9f1" ; then DISTRIB_RELEASE="c9f1"
elif has "ALT p9.* p9 " ; then DISTRIB_RELEASE="p9"
......@@ -252,7 +251,7 @@ if distro altlinux-release ; then
elif has "ALT Linux 5.0" ; then DISTRIB_RELEASE="5.0"
elif has "ALT Linux 4.1" ; then DISTRIB_RELEASE="4.1"
elif has "ALT Linux 4.0" ; then DISTRIB_RELEASE="4.0"
elif has "starter kit" ; then DISTRIB_RELEASE="p8"
elif has "starter kit" ; then DISTRIB_RELEASE="Sisyphus"
elif has Citron ; then DISTRIB_RELEASE="2.4"
fi
PRETTY_NAME="$(cat /etc/altlinux-release)"
......@@ -411,6 +410,8 @@ elif [ "$(uname -o 2>/dev/null)" = "Cygwin" ] ; then
DISTRIB_RELEASE="all"
fi
[ -n "$DISTRIB_ID" ] || DISTRIB_ID="Generic"
if [ -z "$PRETTY_NAME" ] ; then
PRETTY_NAME="$DISTRIB_ID $DISTRIB_RELEASE"
fi
......
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