Merge branch 'master' of github.com:dylanaraps/neofetch

neofetch

@@ -829,7 +829,12 @@ get_distro() {
 
     case "$os" in
         "Linux" | "BSD" | "MINIX")
-            if [[ -f "/etc/redstar-release" ]]; then
+            if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then
+                case "$distro_shorthand" in
+                    "on" | "tiny") distro="Bedrock Linux" ;;
+                    *) distro="$(< /bedrock/etc/bedrock-release)"
+                esac
+            elif [[ -f "/etc/redstar-release" ]]; then
                 case "$distro_shorthand" in
                     "on" | "tiny") distro="Red Star OS" ;;
                     *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)"
@@ -1272,6 +1277,16 @@ get_packages() {
     pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; }
     tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; }
 
+    # Redefine tot() for Bedrock Linux.
+    [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && {
+        tot() {
+            IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done)
+            ((packages+="${#pkgs[@]}"))
+            pac "${#pkgs[@]}"
+        }
+        br_prefix="/bedrock/strata/*"
+    }
+
     case "$os" in
         "Linux" | "BSD" | "iPhone OS" | "Solaris")
             # Package Manager Programs.
@@ -1291,15 +1306,20 @@ get_packages() {
             has "butch"      && tot butch list
 
             # Counting files/dirs.
-            has "emerge"     && dir /var/db/pkg/*/*/
+            # Variables need to be unquoted here. Only Bedrock Linux is affected.
-            has "nix-env"    && dir /nix/store/*/
+            # $br_prefix is fixed and won't change based on user input so this is safe either way.
-            has "guix"       && dir /gnu/store/*/
+            # shellcheck disable=SC2086
-            has "Compile"    && dir /Programs/*/
+            {
-            has "eopkg"      && dir /var/lib/eopkg/package/*
+            has "emerge"  && dir ${br_prefix}/var/db/pkg/*/*/
-            has "crew"       && dir /usr/local/etc/crew/meta/*.filelist
+            has "nix-env" && dir ${br_prefix}/nix/store/*/
-            has "pkgtool"    && dir /var/log/packages/*
+            has "guix"    && dir ${br_prefix}/gnu/store/*/
-            has "cave"       && dir /var/db/paludis/repositories/cross-installed/*/data/*/ \
+            has "Compile" && dir ${br_prefix}/Programs/*/
-                                    /var/db/paludis/repositories/installed/data/*/
+            has "eopkg"   && dir ${br_prefix}/var/lib/eopkg/package/*
+            has "crew"    && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist
+            has "pkgtool" && dir ${br_prefix}/var/log/packages/*
+            has "cave"    && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \
+                                 ${br_prefix}/var/db/paludis/repositories/installed/data/*/
+            }
 
             # Other (Needs complex command)
             has "kpm-pkg" && ((packages+="$(kpm  --get-selections | grep -cv deinstall$)"))
@@ -3422,6 +3442,7 @@ get_ascii() {
 
     # Calculate size of ascii file in line length / line count.
     while IFS=$'\n' read -r line; do
+        line="${line//\\\\/\\}"
         ((++lines,${#line}>ascii_len)) && ascii_len="${#line}"
     done <<< "${ascii_data//\$\{??\}}"
 
@@ -5223,6 +5244,29 @@ ${c1}:syyyyyy/     :yyyyyy/${c2}-yyo.:syyyyyyyyyyy
 EOF
         ;;
 
+        "Bedrock"*)
+            set_colors 0 7
+            read -rd '' ascii_data <<'EOF'
+${c1}--------------------------------------
+--------------------------------------
+--------------------------------------
+---${c2}\\\\\\\\\\\\\\\\\\\\\\\\${c1}-----------------------
+----${c2}\\\\\\      \\\\\\${c1}----------------------
+-----${c2}\\\\\\      \\\\\\${c1}---------------------
+------${c2}\\\\\\      \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\${c1}------
+-------${c2}\\\\\\                    \\\\\\${c1}-----
+--------${c2}\\\\\\                    \\\\\\${c1}----
+---------${c2}\\\\\\        ______      \\\\\\${c1}---
+----------${c2}\\\\\\                   ///${c1}---
+-----------${c2}\\\\\\                 ///${c1}----
+------------${c2}\\\\\\               ///${c1}-----
+-------------${c2}\\\\\\////////////////${c1}------
+--------------------------------------
+--------------------------------------
+--------------------------------------
+EOF
+        ;;
+
         "Bitrig"*)
             set_colors 2 7
             read -rd '' ascii_data <<'EOF'