Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added new OS: Mariner #738

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added new OS: Mariner #738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions screenfetch-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ supported_distros="ALDOS, Alpine Linux, Alter Linux, Amazon Linux, Antergos, Arc
blackPanther OS, BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, \
Debian, Deepin, DesaOS,Devuan, Dragora, DraugerOS, elementary OS, EuroLinux, Evolve OS, Sulin, Exherbo, Fedora(Old and Current Logos), Frugalware, Fuduntu, Funtoo, \
Fux, Gentoo, gNewSense, Guix System, Hyperbola GNU/Linux-libre, januslinux, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, \
LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, \
LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, CBL-Mariner, Mer, Netrunner, NixOS, OBRevenge, openSUSE, \
OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Qubes OS, \
Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, \
SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TeArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS and EndeavourOS"
Expand Down Expand Up @@ -978,6 +978,7 @@ detectdistro () {
distro_codename="n/a"
distro_release="$(/usr/bin/pveversion | grep -oP 'pve-manager\/\K\d+\.\d+')"
fi
[[ "${distro}" == "Mariner" ]] && distro="CBL-Mariner"
fi
fi

Expand Down Expand Up @@ -1285,6 +1286,7 @@ detectdistro () {
void*linux) distro="Void Linux" ;;
zorin*) distro="Zorin OS" ;;
endeavour*) distro="EndeavourOS" ;;
cbl*mariner|mariner*) distro="CBL-Mariner" ;;
esac
if grep -q -i 'Microsoft' /proc/version 2>/dev/null || \
grep -q -i 'Microsoft' /proc/sys/kernel/osrelease 2>/dev/null
Expand Down Expand Up @@ -1404,7 +1406,7 @@ detectpkgs () {
pkgs=$(guix package --list-installed | wc -l) ;;
'ALDOS'|'Fedora'|'Fux'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'SUSE Linux Enterprise'|'Red Hat Enterprise Linux'| \
'ROSA'|'Oracle Linux'|'Scientific Linux'|'EuroLinux'|'CentOS'|'CentOS Stream'|'Mandriva'|'Mandrake'|'Mageia'|'Mer'|'SailfishOS'|'PCLinuxOS'|'Viperr'|'Qubes OS'| \
'Red Star OS'|'blackPanther OS'|'Amazon Linux')
'Red Star OS'|'blackPanther OS'|'Amazon Linux'|'CBL-Mariner')
pkgs=$(rpm -qa | wc -l) ;;
'Void Linux')
pkgs=$(xbps-query -l | wc -l) ;;
Expand Down Expand Up @@ -4939,6 +4941,31 @@ asciiText () {
"${c1} ████████ ████████ ████████ %s"
" %s")
;;
"CBL-Mariner")
if [[ "$no_color" != "1" ]]; then
c1=$(getColor 'light red')
c2=$(getColor 'light green')
c3=$(getColor 'light blue')
c4=$(getColor 'yellow')
fi
if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; c3="${my_lcolor}"; c4="${my_lcolor}"; fi
startline="0"
logowidth="28"
fulloutput=(
"${c1} ████████████${c2} ████████████ %s"
"${c1} ████████████${c2} ████████████ %s"
"${c1} ████████████${c2} ████████████ %s"
"${c1} ████████████${c2} ████████████ %s"
"${c1} ████████████${c2} ████████████ %s"
"${c1} ████████████${c2} ████████████ %s"
"${c1} ${c2} %s"
"${c3} ████████████${c4} ████████████ %s"
"${c3} ████████████${c4} ████████████ %s"
"${c3} ████████████${c4} ████████████ %s"
"${c3} ████████████${c4} ████████████ %s"
"${c3} ████████████${c4} ████████████ %s"
"${c3} ████████████${c4} ████████████ %s")
;;

"Netrunner")
if [[ "$no_color" != "1" ]]; then
Expand Down Expand Up @@ -6282,7 +6309,7 @@ infoDisplay () {
"Obarun"|"Siduction"|"Solus"|"SwagArch"|"Parrot Security"|"Zorin OS"|"Uos"|"TeArch")
labelcolor=$(getColor 'light blue')
;;
"Arch Linux"|"Arch Linux 32"|"Artix Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX"|"OS Elbrus"|"EndeavourOS")
"Arch Linux"|"Arch Linux 32"|"Artix Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX"|"OS Elbrus"|"EndeavourOS"|"CBL-Mariner")
labelcolor=$(getColor 'light cyan')
;;
"Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"| \
Expand Down