Moved guix check below /etc/os-release check

This commit is contained in:
Renzix 2019-06-20 13:19:55 -04:00
parent 5b8ca15f1e
commit 1316df5df8
1 changed files with 7 additions and 6 deletions

View File

@ -883,12 +883,6 @@ get_distro() {
*) distro="GoboLinux $(< /etc/GoboLinuxVersion)" *) distro="GoboLinux $(< /etc/GoboLinuxVersion)"
esac esac
elif type -p guix >/dev/null; then
case "$distro_shorthand" in
"on" | "tiny") distro="GuixSD" ;;
*) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')"
esac
elif type -p crux >/dev/null; then elif type -p crux >/dev/null; then
distro="$(crux)" distro="$(crux)"
case "$distro_shorthand" in case "$distro_shorthand" in
@ -928,6 +922,13 @@ get_distro() {
"tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;;
"off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;;
esac esac
elif type -p guix >/dev/null; then
case "$distro_shorthand" in
"on" | "tiny") distro="GuixSD" ;;
*) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')"
esac
else else
for release_file in /etc/*-release; do for release_file in /etc/*-release; do
distro+="$(< "$release_file")" distro+="$(< "$release_file")"