Merge branch 'hykilpikonna:master' into master

This commit is contained in:
Tilman Holube 2024-05-30 18:29:10 +02:00 committed by GitHub
commit 270334a385
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 916 additions and 125 deletions

View file

@ -870,12 +870,12 @@ image_source="auto"
# archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, ArseLinux, Artix,
# Arya, Asahi, AsteroidOS, astOS, Astra Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch,
# blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, Calculate,
# CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, ChonkySealOS,
# CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS,
# Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt, Condres, Container Linux by CoreOS,
# CRUX, Crystal Linux, Cucumber, CutefishOS, CuteOS, CyberOS, dahlia, DarkOs, Darwin, Debian,
# Deepin, DesaOS, Devuan, DietPi, digital UNIX, DracOS, DragonFly, Drauger, Droidian, Elementary,
# Elive, EncryptOS, EndeavourOS, Endless, Enso, EuroLinux, EvolutionOS, eweOS, Exherbo, Exodia Predator OS,
# Fedora, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS,
# Fedora, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeMiNT, Frugalware, Funtoo, Furreto, GalliumOS,
# Garuda, Gentoo, GhostBSD, glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix,
# Haiku, HamoniKR, HarDClanZ, Hash, Huayra, Hybrid, HydroOS, Hyperbola, iglunix, instantOS, Interix,
# IRIX, Ironclad, Itc, januslinux, Kaisen, Kali, KaOS, KDE, Kibojoe, Kogaion, Korora, KrassOS,
@ -1197,7 +1197,7 @@ get_distro() {
elif type -p lsb_release >/dev/null; then
# Debian does not include .x versions in /etc/os-version, but does in debian_version
# So if that file exists, and we are not *buntu, build name from there
if [[ -f /etc/debian_version ]] && [[ $(lsb_release -si) != *"buntu"* ]]; then
if [[ -f /etc/debian_version ]] && [[ $(lsb_release -si) != *"buntu"* ]] && [[ $(lsb_release -si) != *"neon"* ]]; then
. /etc/os-release
case $distro_shorthand in
on) distro="${NAME}" ;;
@ -2091,14 +2091,29 @@ get_packages() {
else
# If neither exist, use npm root -g to get the global directory.
# (still ~10x faster than npm list)
npm_global=$(npm root -g)
[[ -d $npm_global ]] && dir "$npm_global"/*/
npm_global="$(npm root -g)"
[[ -d "$npm_global" ]] && dir "$npm_global"/*/
# This may not work in WSL2 (if npm is installed on Windows, not WSL).
# However, if npm is not installed on this WSL subsystem, it doesn't really count
# as a package manager for this subsystem, so let's ignore this case.
fi
fi
# Relatively the same for pnpm
if has pnpm; then
# Try to apply heuristics to find the global directory.
PNPM_P="local/share/pnpm/global/5/node_modules"
if [[ -d "$HOME/.$PNPM_P" ]]; then
dir "$HOME/.$PNPM_P"/*/
elif [[ -d "/usr/$PNPM_P" ]]; then
dir "/usr/$PNPM"/*/
else
# If neither exist, use pnpm root -g to get the global directory.
pnpm_global="$(pnpm root -g)"
[[ -d "$pnpm_global" ]] && dir "$pnpm_global"/*/
fi
fi
fi
if has pkgx && [[ -d "$HOME/.local/bin" ]]; then
@ -4532,10 +4547,10 @@ get_term() {
# Workaround for macOS systems that
# don't support the block below.
case $TERM_PROGRAM in
"iTerm.app") term="iTerm2" ;;
"Terminal.app") term="Apple Terminal" ;;
"Hyper") term="HyperTerm" ;;
*) term="${TERM_PROGRAM/\.app}" ;;
"iTerm.app") term="iTerm2" ;;
"Terminal.app"|"Apple_Terminal") term="Apple Terminal" ;;
"Hyper") term="HyperTerm" ;;
*) term="${TERM_PROGRAM/\.app}" ;;
esac
# Most likely TosWin2 on FreeMiNT - quick check
@ -6549,7 +6564,7 @@ ASCII:
Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch,
blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD,
BunsenLabs, CachyOS, Calculate, CalinixOS, Carbs, CBL-Mariner,
CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, ChonkySealOS,
CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS,
Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt, Condres,
Container Linux by CoreOS, CRUX, Crystal Linux, Cucumber,
CutefishOS, CuteOS, CyberOS, dahlia, DarkOs, Darwin, Debian, Deepin,
@ -8744,6 +8759,30 @@ ${c1} .-/-.
EOF
;;
"Chimera"*)
set_colors 1 5 4 1
read -rd '' ascii_data <<'EOF'
${c3}ddddddddddddddc ${c1},cc:
${c3}ddddddddddddddc ${c1},cc:
${c3}ddddddddddddddd ${c1},cc:
${c3}ddddddddddddl:' ${c1},cc:
${c3}dddddddddl' ${c1}..;cc:
${c3}dddddddo. ${c1},:cccccc:
${c3}ddddddl ${c1},ccc:'''''
${c3}dddddo. ${c1};ccc. ............
.ccc. cccccccccccc
${c2}...... ${c1}.ccc. .ccc'''''''''
${c2}OOOOOk. ${c1};ccc. .ccc; ......
${c2}OOOOOOd ${c1}'ccc:,....,:ccc' ${c4}coooooo
${c2}OOOOOOOx. ${c1}':cccccccc:' ${c4}.looooooo
${c2}OOOOOOOOOd, ${c1}`'''` ${c4}.coooooooo
${c2}OOOOOOOOOOOOdc,. ${c4}..,coooooooooooo
${c2}OOOOOOOOOOOOOOOO' ${c4}.oooooooooooooooo
${c2}OOOOOOOOOOOOOOOO' ${c4}.oooooooooooooooo
${c2}OOOOOOOOOOOOOOOO' ${c4}.oooooooooooooooo
EOF
;;
"ChonkySealOS"*)
set_colors 7
read -rd '' ascii_data <<'EOF'
@ -9944,6 +9983,36 @@ ${c1} ,,:;;;;:,,
EOF
;;
"Furreto"*)
set_colors 211 255 225 199
read -rd '' ascii_data <<'EOF'
${c1}
${c1}.xOOko .odd,
o${c3}X${c2}WWK${c3}O${c1}OOO. 'O${c3}N${c2}WW${c3}0${c1}kkk.
.k0${c3}XKO${c1}OOOOOcOO${c2}NWN${c1}OOOOO.
xOOOOOOOOOkkOOOOOOOOO;
.O0OkkocxO000000kcdk0OO0OOkx
k${c3}W${c2}MX${c1}kkkkloxkkkx; :dxxxxddc...
'kO0OOOOOkc .cl:..kk0KK0Okc
;kOOO0000xd. dO00000Oo .xkO${c3}N${c2}MM${c3}X${c1}OOOO
.dddxkOOOkddc.k${c3}K${c2}NWW${c3}N${c1}000000l.ddk${c2}00${c1}00OOOO.
'dd:;ddddd;.d${c3}K${c2}MMM${c3}W${c1}K00KKK0O::ddxkO00Oko
.okxkOKK0kkOO00KKOxxlodddddddl
.00OOkkkkkkkkOOO00OOOO0O; .dddl
'kkkkkxxkkkkkkkOOkxdxkxxddd.
cddddddddxxkkkkk${c4}xddddddddddo
'ddddddodddddddddddddddddddc
.ddddddodddddddddodddddddc
.odddo.
.kOOkkk;
lkKWNkkkxc
kkxkkkkkkx.
,,..xxx.
EOF
;;
"freebsd_small")
set_colors 1 7 3
read -rd '' ascii_data <<'EOF'