EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

general: Fix conflicts

This commit is contained in:
Dylan Araps 2021-06-11 05:14:33 +00:00
parent c0ceffb554 528010e045
commit 097e60bc62
1 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
neofetch
View File

@ -971,7 +971,7 @@ get_distro() {
case $os in case $os in
Linux|BSD|MINIX) Linux|BSD|MINIX)
if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then if [[ -f /bedrock/etc/bedrock-release && -z $BEDROCK_RESTRICT ]]; then
case $distro_shorthand in case $distro_shorthand in
on|tiny) distro="Bedrock Linux" ;; on|tiny) distro="Bedrock Linux" ;;
*) distro=$(< /bedrock/etc/bedrock-release) *) distro=$(< /bedrock/etc/bedrock-release)
@ -1505,7 +1505,9 @@ get_packages() {
# pac: If packages > 0, log package manager name. # pac: If packages > 0, log package manager name.
# tot: Count lines in command output. # tot: Count lines in command output.
has() { type -p "$1" >/dev/null && manager=$1; } has() { type -p "$1" >/dev/null && manager=$1; }
dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } # globbing is intentional here
# shellcheck disable=SC2206
dir() { pkgs=($@); ((packages+=${#pkgs[@]})); pac "$((${#pkgs[@]}-pkgs_h))"; }
pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; }
tot() { tot() {
IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";
@ -1513,14 +1515,22 @@ get_packages() {
pac "$((${#pkgs[@]}-pkgs_h))"; pac "$((${#pkgs[@]}-pkgs_h))";
} }
# Redefine tot() for Bedrock Linux. # Redefine tot() and dir() for Bedrock Linux.
[[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && {
br_strata=$(brl list)
tot() { tot() {
IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in ${br_strata}; do strat -r "$s" "$@"; done)"
((packages+="${#pkgs[@]}")) ((packages+="${#pkgs[@]}"))
pac "$((${#pkgs[@]}-pkgs_h))"; pac "$((${#pkgs[@]}-pkgs_h))";
} }
br_prefix="/bedrock/strata/*" dir() {
local pkgs=()
# globbing is intentional here
# shellcheck disable=SC2206
for s in ${br_strata}; do pkgs+=(/bedrock/strata/$s/$@); done
((packages+=${#pkgs[@]}))
pac "$((${#pkgs[@]}-pkgs_h))"
}
} }
case $os in case $os in
@ -1560,16 +1570,16 @@ get_packages() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
{ {
shopt -s nullglob shopt -s nullglob
has brew && dir "$(brew --cellar)"/* has brew && dir "$(brew --cellar)/*"
has emerge && dir ${br_prefix}/var/db/pkg/*/*/ has emerge && dir "/var/db/pkg/*/*"
has Compile && dir ${br_prefix}/Programs/*/ has Compile && dir "/Programs/*/"
has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* has eopkg && dir "/var/lib/eopkg/package/*"
has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist has crew && dir "/usr/local/etc/crew/meta/*.filelist"
has pkgtool && dir ${br_prefix}/var/log/packages/* has pkgtool && dir "/var/log/packages/*"
has scratch && dir ${br_prefix}/var/lib/scratchpkg/index/*/.pkginfo has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo"
has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* has kagami && dir "/var/lib/kagami/pkgs/*"
has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ has cave && dir "/var/db/paludis/repositories/cross-installed/*/data/*/ \
${br_prefix}/var/db/paludis/repositories/installed/data/*/ /var/db/paludis/repositories/installed/data/*/"
shopt -u nullglob shopt -u nullglob
} }
@ -5494,6 +5504,32 @@ ${c1}
EOF EOF
;; ;;
"AlmaLinux"*)
set_colors 1 3 4 2 6
read -rd '' ascii_data <<'EOF'
${c1} 'c:.
${c1} lkkkx, .. ${c2}.. ,cc,
${c1} okkkk:ckkx' ${c2}.lxkkx.okkkkd
${c1} .:llcokkx' ${c2}:kkkxkko:xkkd,
${c1} .xkkkkdood: ${c2};kx, .lkxlll;
${c1} xkkx. ${c2}xk' xkkkkk:
${c1} 'xkx. ${c2}xd .....,.
${c3} .. ${c1}:xkl' ${c2}:c ..''..
${c3} .dkx' ${c1}.:ldl:'. ${c2}' ${c4}':lollldkkxo;
${c3} .''lkkko' ${c4}ckkkx.
${c3}'xkkkd:kkd. .. ${c5};' ${c4}:kkxo.
${c3},xkkkd;kk' ,d; ${c5}ld. ${c4}':dkd::cc,
${c3} .,,.;xkko'.';lxo. ${c5}dx, ${c4}:kkk'xkkkkc
${c3} 'dkkkkkxo:. ${c5};kx ${c4}.kkk:;xkkd.
${c3} ..... ${c5}.;dk:. ${c5}lkk. ${c4}:;,
${c5}:kkkkkkkdoxkkx
,c,,;;;:xkkd.
;kkkkl...
;kkkkl
,od;
EOF
;;
"alpine_small") "alpine_small")
set_colors 4 7 set_colors 4 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'