浏览代码

Merge pull request #1271 from Renzix/master

Moved guix check below /etc/os-release check
black 6 年之前
父节点
当前提交
7dc8145971
共有 1 个文件被更改,包括 7 次插入6 次删除
  1. 7 6
      neofetch

+ 7 - 6
neofetch

@@ -883,12 +883,6 @@ get_distro() {
                     *) distro="GoboLinux $(< /etc/GoboLinuxVersion)"
                 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
                 distro="$(crux)"
                 case "$distro_shorthand" in
@@ -928,6 +922,13 @@ get_distro() {
                     "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;;
                     "off")  distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;;
                 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
                 for release_file in /etc/*-release; do
                     distro+="$(< "$release_file")"