From 845e74c5c3daff3f3d5a5f2a10edde279627c5b5 Mon Sep 17 00:00:00 2001 From: Tim Otlik Date: Fri, 16 Feb 2018 12:56:47 +0100 Subject: added LINUX_*_ICON for several OS --- functions/utilities.zsh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'functions/utilities.zsh') diff --git a/functions/utilities.zsh b/functions/utilities.zsh index b4bfb838..5f41f73e 100644 --- a/functions/utilities.zsh +++ b/functions/utilities.zsh @@ -105,6 +105,22 @@ case $(uname) in OS='Linux' OS_ICON=$(print_icon 'LINUX_ICON') + # Check if the OS is debian + if [ `lsb_release -si`="Debian" ]; then + OS='Debian' + OS_ICON=$(print_icon 'LINUX_DEBIAN_ICON') + fi + # Check if the OS is ubuntu + if [ `lsb_release -si`="Ubuntu" ]; then + OS='Ubuntu' + OS_ICON=$(print_icon 'LINUX_Ubuntu_ICON') + fi + # Check if the OS is mint + if [ `lsb_release -si`="Mint" ]; then + OS='Mint' + OS_ICON=$(print_icon 'LINUX_MINT_ICON') + fi + # Check if we're running on Android case $(uname -o 2>/dev/null) in Android) -- cgit v1.2.3 From bba8bb883e6990ebd4216c1fe025e9d0fa9121a3 Mon Sep 17 00:00:00 2001 From: Tim Otlik Date: Fri, 16 Feb 2018 16:45:09 +0100 Subject: add check of /etc/os-release for linux distros --- functions/colors.zsh | 0 functions/icons.zsh | 26 +++++++++---------- functions/utilities.zsh | 67 +++++++++++++++++++++++++++++++++++++++---------- functions/vcs.zsh | 0 4 files changed, 66 insertions(+), 27 deletions(-) mode change 100644 => 100755 functions/colors.zsh mode change 100644 => 100755 functions/icons.zsh mode change 100644 => 100755 functions/utilities.zsh mode change 100644 => 100755 functions/vcs.zsh (limited to 'functions/utilities.zsh') diff --git a/functions/colors.zsh b/functions/colors.zsh old mode 100644 new mode 100755 diff --git a/functions/icons.zsh b/functions/icons.zsh old mode 100644 new mode 100755 index 25546e77..5ae889e3 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -278,20 +278,18 @@ case $POWERLEVEL9K_MODE in FREEBSD_ICON $'\UF30E ' #  ANDROID_ICON $'\uF17B' #  LINUX_ARCH_ICON $'\uF300' #  - LINUX_DEBIAN_ICON $'\uF302' #  - LINUX_UBUNTU_ICON $'\uF30C' #  - LINUX_CENTOS_ICON $'\uF301' #  - LINUX_COREOS_ICON $'\uF30F' #  - LINUX_ELEMENTARY_ICON $'\uF311' #  - LINUX_FEDORA_ICON $'\uF303' #  - LINUX_GENTOO_ICON $'\uF310' #  - LINUX_MINT_ICON $'\uF304' #  - LINUX_MAGEIA_ICON $'\uF306' #  - LINUX_MANDRIVA_ICON $'\uF307' #  - LINUX_OPENSUSE_ICON $'\uF308' #  - LINUX_REDHAT_ICON $'\uF309' #  - LINUX_SABAYON_ICON $'\uF313' #  - LINUX_SLACKWARE_ICON $'\uF30A' #  + LINUX_DEBIAN_ICON $'\uF302' #  + LINUX_UBUNTU_ICON $'\uF30C' #  + LINUX_CENTOS_ICON $'\uF301' #  + LINUX_COREOS_ICON $'\uF30F' #  + LINUX_ELEMENTARY_ICON $'\uF311' #  + LINUX_FEDORA_ICON $'\uF303' #  + LINUX_GENTOO_ICON $'\uF310' #  + LINUX_MINT_ICON $'\uF304' #  + LINUX_MAGEIA_ICON $'\uF306' #  + LINUX_OPENSUSE_ICON $'\uF308' #  + LINUX_SABAYON_ICON $'\uF313' #  + LINUX_SLACKWARE_ICON $'\uF30A' #  LINUX_ICON $'\uF17C' #  SUNOS_ICON $'\uF185 ' #  HOME_ICON $'\uF015' #  diff --git a/functions/utilities.zsh b/functions/utilities.zsh old mode 100644 new mode 100755 index 5f41f73e..89020b09 --- a/functions/utilities.zsh +++ b/functions/utilities.zsh @@ -102,24 +102,65 @@ case $(uname) in OS_ICON=$(print_icon 'FREEBSD_ICON') ;; Linux) - OS='Linux' - OS_ICON=$(print_icon 'LINUX_ICON') - - # Check if the OS is debian - if [ `lsb_release -si`="Debian" ]; then + os_release_id="$(grep -E '^ID=([a-zA-Z]*)' /etc/os-release | cut -d '=' -f 2)" + case "$os_release_id" in + "arch") + OS='Arch' + OS_ICON=$(print_icon 'LINUX_ARCH_ICON') + ;; + "debian") OS='Debian' OS_ICON=$(print_icon 'LINUX_DEBIAN_ICON') - fi - # Check if the OS is ubuntu - if [ `lsb_release -si`="Ubuntu" ]; then + ;; + "ubuntu") OS='Ubuntu' - OS_ICON=$(print_icon 'LINUX_Ubuntu_ICON') - fi - # Check if the OS is mint - if [ `lsb_release -si`="Mint" ]; then + OS_ICON=$(print_icon 'LINUX_UBUNTU_ICON') + ;; + "elementary") + OS='Elementary' + OS_ICON=$(print_icon 'LINUX_ELEMENTARY_ICON') + ;; + "fedora") + OS='Fedora' + OS_ICON=$(print_icon 'LINUX_FEDORA_ICON') + ;; + "coreos") + OS='CoreOS' + OS_ICON=$(print_icon 'LINUX_COREOS_ICON') + ;; + "gentoo") + OS='Gentoo' + OS_ICON=$(print_icon 'LINUX_GENTOO_ICON') + ;; + "mageia") + OS='Mageia' + OS_ICON=$(print_icon 'LINUX_MAGEIA_ICON') + ;; + "centos") + OS='CentOS' + OS_ICON=$(print_icon 'LINUX_CENTOS_ICON') + ;; + "opensuse"|"tumbleweed") + OS='OpenSUSE' + OS_ICON=$(print_icon 'LINUX_OPENSUSE_ICON') + ;; + "sabayon") + OS='Sabayon' + OS_ICON=$(print_icon 'LINUX_SABAYON_ICON') + ;; + "slackware") + OS='Slackware' + OS_ICON=$(print_icon 'LINUX_SLACKWARE_ICON') + ;; + "linuxmint") OS='Mint' OS_ICON=$(print_icon 'LINUX_MINT_ICON') - fi + ;; + *) + OS='Linux' + OS_ICON=$(print_icon 'LINUX_ICON') + ;; + esac # Check if we're running on Android case $(uname -o 2>/dev/null) in diff --git a/functions/vcs.zsh b/functions/vcs.zsh old mode 100644 new mode 100755 -- cgit v1.2.3 From 80176c263f0d4343a043e3284082299d9bfc5b8d Mon Sep 17 00:00:00 2001 From: Tim Otlik Date: Mon, 19 Feb 2018 18:48:21 +0100 Subject: fix $OS variable for battery segment --- functions/utilities.zsh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'functions/utilities.zsh') diff --git a/functions/utilities.zsh b/functions/utilities.zsh index 89020b09..1f4df9bc 100755 --- a/functions/utilities.zsh +++ b/functions/utilities.zsh @@ -102,58 +102,46 @@ case $(uname) in OS_ICON=$(print_icon 'FREEBSD_ICON') ;; Linux) + OS='Linux' os_release_id="$(grep -E '^ID=([a-zA-Z]*)' /etc/os-release | cut -d '=' -f 2)" case "$os_release_id" in "arch") - OS='Arch' OS_ICON=$(print_icon 'LINUX_ARCH_ICON') ;; "debian") - OS='Debian' OS_ICON=$(print_icon 'LINUX_DEBIAN_ICON') ;; "ubuntu") - OS='Ubuntu' OS_ICON=$(print_icon 'LINUX_UBUNTU_ICON') ;; "elementary") - OS='Elementary' OS_ICON=$(print_icon 'LINUX_ELEMENTARY_ICON') ;; "fedora") - OS='Fedora' OS_ICON=$(print_icon 'LINUX_FEDORA_ICON') ;; "coreos") - OS='CoreOS' OS_ICON=$(print_icon 'LINUX_COREOS_ICON') ;; "gentoo") - OS='Gentoo' OS_ICON=$(print_icon 'LINUX_GENTOO_ICON') ;; "mageia") - OS='Mageia' OS_ICON=$(print_icon 'LINUX_MAGEIA_ICON') ;; "centos") - OS='CentOS' OS_ICON=$(print_icon 'LINUX_CENTOS_ICON') ;; "opensuse"|"tumbleweed") - OS='OpenSUSE' OS_ICON=$(print_icon 'LINUX_OPENSUSE_ICON') ;; "sabayon") - OS='Sabayon' OS_ICON=$(print_icon 'LINUX_SABAYON_ICON') ;; "slackware") - OS='Slackware' OS_ICON=$(print_icon 'LINUX_SLACKWARE_ICON') ;; "linuxmint") - OS='Mint' OS_ICON=$(print_icon 'LINUX_MINT_ICON') ;; *) -- cgit v1.2.3