Cleanup distro detection

2016-03-26 22:13:03 +11:00
parent 7c62ff2d26
commit 8311d3f2e3
1 changed files with 3 additions and 6 deletions
--- a/7
+++ b/7
@@ -463,14 +463,11 @@ case "$os" in
            distro="$(crux)"

        else
-            distro="$(grep -h '^NAME=' /etc/*ease)"
+            distro="$(awk -F 'NAME="|"' '/^NAME=/ {printf $2}' /etc/*ease)"

            # Workaround for distros that store the value differently.
-            [ -z "$distro" ] && distro="$(grep -h 'TAILS_PRODUCT_NAME' /etc/*ease)"
+            [ -z "$distro" ] && distro="$(awk -F 'TAILS_PRODUCT_NAME="|"' '/^TAILS_PRODUCT_NAME=/ {printf $2}' /etc/*ease)"
            [ -z "$distro" ] && distro="$(awk '/BLAG/ {print $1; exit}' /etc/*ease)"
-
-            distro=${distro/*NAME\=}
-            distro=${distro//\"}
        fi
    ;;